Projects >> nuxeo >>6e39069c65501fbc8e941739bd10bab50a36845b

Chunk
Conflicting content 
        wDocRightsPolicyBusinessDelegate = new WorkflowDocumentSecurityPolicyBusinessDelegate();
    }

<<<<<<< HEAD
    public void afterBegin() {
        log.debug("afterBegin().........................................");
=======
    public void afterBegin() throws EJBException {
>>>>>>> 57df385ba2e8df09c08f5e261e00ba100674e7aa
        try {
            log.trace("Connect workflow document manager");
            documentManager = getDocumentManager();
Solution content 
        wDocRightsPolicyBusinessDelegate = new WorkflowDocumentSecurityPolicyBusinessDelegate();
    }

    public void afterBegin() throws EJBException {
        try {
            log.trace("Connect workflow document manager");
            documentManager = getDocumentManager();
File
AbstractWorkflowDocumentManager.java
Developer's decision
Version 2
Kind of conflict
Method invocation
Method signature
Chunk
Conflicting content 
        }
    }

<<<<<<< HEAD
    public void afterCompletion(boolean committed) {
        log.debug("afterCompletion()....................................");
=======
    public void afterCompletion(boolean committed) throws EJBException {
>>>>>>> 57df385ba2e8df09c08f5e261e00ba100674e7aa
        try {
            if (documentManager != null) {
                log.trace("Disconnect workflow document manager");
Solution content 
        }
    }

    public void afterCompletion(boolean committed) throws EJBException {
        try {
            if (documentManager != null) {
                log.trace("Disconnect workflow document manager");
File
AbstractWorkflowDocumentManager.java
Developer's decision
Version 2
Kind of conflict
Method invocation
Method signature
Chunk
Conflicting content 
import javax.annotation.PreDestroy;
import javax.ejb.Local;
import javax.ejb.Remote;
<<<<<<< HEAD
import javax.ejb.Stateful;
=======
import javax.ejb.Remove;
import javax.ejb.Stateless;
import javax.naming.NamingException;
>>>>>>> 57df385ba2e8df09c08f5e261e00ba100674e7aa

import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
Solution content 
import javax.annotation.PreDestroy;
import javax.ejb.Local;
import javax.ejb.Remote;
import javax.ejb.Remove;
import javax.ejb.Stateless;
import javax.naming.NamingException;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
File
WorkflowDocumentSecurityBean.java
Developer's decision
Version 2
Kind of conflict
Import