Projects >> openengsb >>c340fe5345c9d5c4b417fe2ce2730a794354b886

Chunk
Conflicting content 
    private DeployDomainEvents deployEvents;

    private Executor executor = Executors.newSingleThreadExecutor();
<<<<<<< HEAD
=======
    private ExecutorService outputReaderPool = Executors.newCachedThreadPool();
>>>>>>> fa078cafe3cd815cce67bcddf54848eee65189ad

    private boolean synchronous = false;
Solution content 
    private DeployDomainEvents deployEvents;

    private Executor executor = Executors.newSingleThreadExecutor();
    private ExecutorService outputReaderPool = Executors.newCachedThreadPool();

    private boolean synchronous = false;
File
MavenServiceImpl.java
Developer's decision
Version 2
Kind of conflict
Attribute
Method invocation
Chunk
Conflicting content 
    private String command;
    private File logDir;

<<<<<<< HEAD
    public MavenServiceImpl(String id) {
        super(id);
=======
    public MavenServiceImpl() {
        String karafData = System.getProperty("karaf.data");
        logDir = new File(karafData, "log");
        if (!logDir.exists()) {
            logDir.mkdir();
        } else if (!logDir.isDirectory()) {
            throw new IllegalStateException("cannot access log-directory");
        }
>>>>>>> fa078cafe3cd815cce67bcddf54848eee65189ad
    }

    private static String addSystemEnding() {
Solution content 
    private String command;
    private File logDir;

    public MavenServiceImpl(String id) {
        super(id);
        String karafData = System.getProperty("karaf.data");
        logDir = new File(karafData, "log");
        if (!logDir.exists()) {
            logDir.mkdir();
        } else if (!logDir.isDirectory()) {
            throw new IllegalStateException("cannot access log-directory");
        }
    }

    private static String addSystemEnding() {
File
MavenServiceImpl.java
Developer's decision
Combination
Kind of conflict
Attribute
If statement
Method invocation
Method signature
Variable
Chunk
Conflicting content 
import org.junit.Before;
import org.junit.Ignore;
import org.junit.Test;
<<<<<<< HEAD
import org.openengsb.core.common.AliveState;
=======
import org.mockito.ArgumentCaptor;
import org.mockito.invocation.InvocationOnMock;
import org.mockito.stubbing.Answer;
>>>>>>> fa078cafe3cd815cce67bcddf54848eee65189ad
import org.openengsb.core.common.context.ContextCurrentService;
import org.openengsb.domain.build.BuildDomainEvents;
import org.openengsb.domain.build.BuildStartEvent;
Solution content 
import org.junit.Before;
import org.junit.Ignore;
import org.junit.Test;
import org.mockito.ArgumentCaptor;
import org.mockito.invocation.InvocationOnMock;
import org.mockito.stubbing.Answer;
import org.openengsb.core.common.AliveState;
import org.openengsb.core.common.context.ContextCurrentService;
import org.openengsb.domain.build.BuildDomainEvents;
import org.openengsb.domain.build.BuildStartEvent;
File
MavenServiceTest.java
Developer's decision
Concatenation
Kind of conflict
Import