[rhmessaging-commits] rhmessaging commits: r2666 - store/branches/java/broker-queue-refactor/java/bdbstore/src/tools/java/org/apache/qpid/server/store/berkeleydb.

[rhmessaging-commits at lists.jboss.org]

Author: ritchiem
Date: 2008-10-21 09:19:59 -0400 (Tue, 21 Oct 2008)
New Revision: 2666

Modified:
   store/branches/java/broker-queue-refactor/java/bdbstore/src/tools/java/org/apache/qpid/server/store/berkeleydb/BDBStoreUpgrade.java
Log:
Update to stop 'Upgrade will create a new store at ...' message when performing in place update.

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	2008-10-20 20:42:22 UTC (rev 2665)
+++ store/branches/java/broker-queue-refactor/java/bdbstore/src/tools/java/org/apache/qpid/server/store/berkeleydb/BDBStoreUpgrade.java	2008-10-21 13:19:59 UTC (rev 2666)
@@ -305,7 +305,11 @@
             }
             else
             {
-                _logger.info("Upgrade will create a new store at '" + toDir + "'");
+                if (!inplace)
+                {
+                    _logger.info("Upgrade will create a new store at '" + toDir + "'");
+                }
+
                 _logger.info("Using the contents in the Message Store '" + fromDir + "'");
 
                 if (!userInteract("Do you wish to proceed?"))