Projects >> qpid >>cbca49b56cf17602bfaba5bbe6f5ab9d18f97e85

Chunk
Conflicting content 
import java.util.UUID;

import org.apache.log4j.Logger;
<<<<<<< HEAD
import org.apache.qpid.AMQStoreException;
import org.apache.qpid.server.message.EnqueableMessage;
=======
import org.apache.qpid.server.message.EnqueueableMessage;
>>>>>>> b9d59d86496cccf609210a0b1fc2fb9b9e224d7e
import org.apache.qpid.server.model.VirtualHost;
import org.apache.qpid.server.store.MessageStoreRecoveryHandler.StoredMessageRecoveryHandler;
import org.apache.qpid.test.utils.QpidTestCase;
Solution content 
import java.util.UUID;

import org.apache.log4j.Logger;
import org.apache.qpid.AMQStoreException;
import org.apache.qpid.server.message.EnqueueableMessage;
import org.apache.qpid.server.model.VirtualHost;
import org.apache.qpid.server.store.MessageStoreRecoveryHandler.StoredMessageRecoveryHandler;
import org.apache.qpid.test.utils.QpidTestCase;
File
MessageStoreQuotaEventsTestBase.java
Developer's decision
Combination
Kind of conflict
Import
Chunk
Conflicting content 
        assertEvent(2, Event.PERSISTENT_MESSAGE_SIZE_UNDERFULL);
    }

<<<<<<< HEAD
    protected EnqueableMessage addMessage(long id) throws AMQStoreException
=======
    protected EnqueueableMessage addMessage(long id)
>>>>>>> b9d59d86496cccf609210a0b1fc2fb9b9e224d7e
    {
        StorableMessageMetaData metaData = createMetaData(id, MESSAGE_DATA.length);
        StoredMessage handle = _store.addMessage(metaData);
Solution content 
        assertEvent(2, Event.PERSISTENT_MESSAGE_SIZE_UNDERFULL);
    }

    protected EnqueueableMessage addMessage(long id) throws AMQStoreException
    {
        StorableMessageMetaData metaData = createMetaData(id, MESSAGE_DATA.length);
        StoredMessage handle = _store.addMessage(metaData);
File
MessageStoreQuotaEventsTestBase.java
Developer's decision
Manual
Kind of conflict
Method signature
Chunk
Conflicting content 
        assertEquals(State.INITIAL, _manager.getState());

        performInvalidTransitions(StateManager.INITIALISE, State.INITIALISED);
<<<<<<< HEAD
        performInvalidTransitions(StateManager.INITALISE_COMPLETE, State.ACTIVATING, State.CLOSING);
        performInvalidTransitions(StateManager.ACTIVATE, State.ACTIVE, State.CLOSING);
=======
        performInvalidTransitions(StateManager.INITIALISE_COMPLETE, State.ACTIVATING, State.CLOSING);
        performInvalidTransitions(StateManager.ACTIVATE, State.ACTIVE);
>>>>>>> b9d59d86496cccf609210a0b1fc2fb9b9e224d7e
        performInvalidTransitions(StateManager.ACTIVATE_COMPLETE, State.QUIESCING, State.CLOSING, State.INITIALISED);
        performInvalidTransitions(StateManager.QUIESCE, State.QUIESCED);
        performInvalidTransitions(StateManager.QUIESCE_COMPLETE, State.ACTIVATING, State.CLOSING);
Solution content 
        assertEquals(State.INITIAL, _manager.getState());

        performInvalidTransitions(StateManager.INITIALISE, State.INITIALISED);
        performInvalidTransitions(StateManager.INITIALISE_COMPLETE, State.ACTIVATING, State.CLOSING);
        performInvalidTransitions(StateManager.ACTIVATE, State.ACTIVE, State.CLOSING);
        performInvalidTransitions(StateManager.ACTIVATE_COMPLETE, State.QUIESCING, State.CLOSING, State.INITIALISED);
        performInvalidTransitions(StateManager.QUIESCE, State.QUIESCED);
        performInvalidTransitions(StateManager.QUIESCE_COMPLETE, State.ACTIVATING, State.CLOSING);
File
StateManagerTest.java
Developer's decision
Combination
Kind of conflict
Method invocation