[rhmessaging-commits] rhmessaging commits: r3678 - store/trunk/java/bdbstore/src/tools/java/org/apache/qpid/server/store/berkeleydb.

[rhmessaging-commits at lists.jboss.org]

Author: ritchiem
Date: 2009-10-22 10:27:01 -0400 (Thu, 22 Oct 2009)
New Revision: 3678

Modified:
   store/trunk/java/bdbstore/src/tools/java/org/apache/qpid/server/store/berkeleydb/BDBStoreUpgrade.java
Log:
Set the CurrentActor to allow the VirtualHost to be created

Modified: store/trunk/java/bdbstore/src/tools/java/org/apache/qpid/server/store/berkeleydb/BDBStoreUpgrade.java
===================================================================
--- store/trunk/java/bdbstore/src/tools/java/org/apache/qpid/server/store/berkeleydb/BDBStoreUpgrade.java	2009-10-22 13:41:28 UTC (rev 3677)
+++ store/trunk/java/bdbstore/src/tools/java/org/apache/qpid/server/store/berkeleydb/BDBStoreUpgrade.java	2009-10-22 14:27:01 UTC (rev 3678)
@@ -27,6 +27,9 @@
 import org.apache.qpid.server.virtualhost.VirtualHost;
 import org.apache.qpid.server.registry.ApplicationRegistry;
 import org.apache.qpid.server.configuration.VirtualHostConfiguration;
+import org.apache.qpid.server.logging.actors.CurrentActor;
+import org.apache.qpid.server.logging.actors.BrokerActor;
+import org.apache.qpid.server.logging.NullRootMessageLogger;
 import org.apache.qpid.AMQException;
 import org.apache.qpid.util.FileUtils;
 import org.apache.commons.cli.PosixParser;
@@ -328,6 +331,8 @@
             }
         }
 
+        CurrentActor.set(new BrokerActor(new NullRootMessageLogger()));
+
         // Note the name of the Vhosts is not important, the store doesnot record the name of the vhost.
         _newVirtualHost = new VirtualHost(new VirtualHostConfiguration("Upgraded", new PropertiesConfiguration()), new MemoryMessageStore());
         _oldVirtualHost = new VirtualHost(new VirtualHostConfiguration("Old", new PropertiesConfiguration()), new MemoryMessageStore());
@@ -745,6 +750,7 @@
         }
         catch (Exception e)
         {
+            e.printStackTrace();
             _logger.error("Upgrade Failed: " + e.getMessage());            
         }
     }
@@ -761,4 +767,5 @@
         help();
         System.exit(0);
     }
+
 }