[rhmessaging-commits] rhmessaging commits: r3143 - in store/branches/java/broker-queue-refactor/java/bdbstore/src: test/java/org/apache/qpid/server/store/berkeleydb and 1 other directories.

Author: ritchiem Date: 2009-03-11 07:23:01 -0400 (Wed, 11 Mar 2009) New Revision: 3143 Modified: store/branches/java/broker-queue-refactor/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBMessageStore.java store/branches/java/broker-queue-refactor/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/StoreContextRaceConditionTest.java store/branches/java/broker-queue-refactor/java/bdbstore/src/tools/java/org/apache/qpid/server/store/berkeleydb/BDBStoreUpgrade.java Log: Update to comments, removed unused getNewMessageId() method Modified: store/branches/java/broker-queue-refactor/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBMessageStore.java =================================================================== --- store/branches/java/broker-queue-refactor/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBMessageStore.java 2009-03-10 15:08:30 UTC (rev 3142) +++ store/branches/java/broker-queue-refactor/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBMessageStore.java 2009-03-11 11:23:01 UTC (rev 3143) @@ -42,7 +42,6 @@ import org.apache.qpid.framing.FieldTable; import org.apache.qpid.framing.abstraction.ContentChunk; import org.apache.qpid.server.exchange.Exchange; -import org.apache.qpid.server.queue.AMQMessage; import org.apache.qpid.server.queue.AMQQueue; import org.apache.qpid.server.queue.AMQQueueFactory; import org.apache.qpid.server.queue.MessageFactory; @@ -244,7 +243,7 @@ { stateTransition(State.CONFIGURING, State.CONFIGURED); - //If we have loaded an environment and have virtualHost configured then recover environment + //If we have loaded an environment and have virtualHost configured then load environment if (!newEnvironment && virtualHost != null) { // this recovers durable queues and persistent messages @@ -1299,16 +1298,6 @@ } /** - * Return a valid, currently unused message id. - * - * @return A fresh message id. - */ - public Long getNewMessageId() - { - return _messageId.getAndIncrement(); - } - - /** * Stores a chunk of message data. * * @param context The transactional context for the operation. @@ -1944,7 +1933,7 @@ } catch (AMQException e) { - //todo As we are jus swallowing exception need to add clean up in recover(). + //todo As we are jus swallowing exception need to add clean up in load(). // This should purge any message content that doesn't have any delivery records. _log.debug("Error occured removing unreferenced message:" + e.getMessage()); } Modified: store/branches/java/broker-queue-refactor/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/StoreContextRaceConditionTest.java =================================================================== --- store/branches/java/broker-queue-refactor/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/StoreContextRaceConditionTest.java 2009-03-10 15:08:30 UTC (rev 3142) +++ store/branches/java/broker-queue-refactor/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/StoreContextRaceConditionTest.java 2009-03-11 11:23:01 UTC (rev 3143) @@ -69,7 +69,7 @@ { try { - //Stop the connection to prevent flow + //Stop the connection to prevent unload connection.stop(); //Create Consumer to receive msgs MessageConsumer consumer = session.createConsumer(_queue); @@ -88,7 +88,7 @@ Thread.sleep(1000); _logger.info("***** SLEEP"); - //Allw the messages to flow to us + //Allw the messages to unload to us connection.start(); _logger.info("***** START Consumer"); //*** Starts Async process Modified: store/branches/java/broker-queue-refactor/java/bdbstore/src/tools/java/org/apache/qpid/server/store/berkeleydb/BDBStoreUpgrade.java =================================================================== --- store/branches/java/broker-queue-refactor/java/bdbstore/src/tools/java/org/apache/qpid/server/store/berkeleydb/BDBStoreUpgrade.java 2009-03-10 15:08:30 UTC (rev 3142) +++ store/branches/java/broker-queue-refactor/java/bdbstore/src/tools/java/org/apache/qpid/server/store/berkeleydb/BDBStoreUpgrade.java 2009-03-11 11:23:01 UTC (rev 3143) @@ -417,7 +417,7 @@ // // queue.stop(); // - // An alternative approach was taken here: If we don't recover the store + // An alternative approach was taken here: If we don't load the store _count++; } };