[hornetq-commits] JBoss hornetq SVN: r10109 - in trunk/src/main/org/hornetq/core: server/impl and 1 other directory.

[do-not-reply at jboss.org]

Author: ataylor
Date: 2011-01-07 11:49:22 -0500 (Fri, 07 Jan 2011)
New Revision: 10109

Modified:
   trunk/src/main/org/hornetq/core/config/impl/ConfigurationImpl.java
   trunk/src/main/org/hornetq/core/server/impl/HornetQServerImpl.java
Log:
added tostring for extra debug to configuration

Modified: trunk/src/main/org/hornetq/core/config/impl/ConfigurationImpl.java
===================================================================
--- trunk/src/main/org/hornetq/core/config/impl/ConfigurationImpl.java	2011-01-07 15:57:35 UTC (rev 10108)
+++ trunk/src/main/org/hornetq/core/config/impl/ConfigurationImpl.java	2011-01-07 16:49:22 UTC (rev 10109)
@@ -1379,4 +1379,18 @@
       this.name = name;
    }
 
+   @Override
+   public String toString()
+   {
+      StringBuffer sb = new StringBuffer("HornetQ Configuration (");
+      sb.append("clustered=").append(clustered).append(",");
+      sb.append("backup=").append(backup).append(",");
+      sb.append("sharedStore=").append(sharedStore).append(",");
+      sb.append("journalDirectory=").append(journalDirectory).append(",");
+      sb.append("bindingsDirectory=").append(bindingsDirectory).append(",");
+      sb.append("largeMessagesDirectory=").append(largeMessagesDirectory).append(",");
+      sb.append("pagingDirectory=").append(pagingDirectory);
+      sb.append(")");
+      return sb.toString();
+   }
 }

Modified: trunk/src/main/org/hornetq/core/server/impl/HornetQServerImpl.java
===================================================================
--- trunk/src/main/org/hornetq/core/server/impl/HornetQServerImpl.java	2011-01-07 15:57:35 UTC (rev 10108)
+++ trunk/src/main/org/hornetq/core/server/impl/HornetQServerImpl.java	2011-01-07 16:49:22 UTC (rev 10109)
@@ -15,6 +15,7 @@
 
 import java.io.File;
 import java.lang.management.ManagementFactory;
+import java.nio.channels.ClosedChannelException;
 import java.security.AccessController;
 import java.security.PrivilegedAction;
 import java.util.ArrayList;
@@ -427,6 +428,10 @@
          {
             //this is ok, we are being stopped
          }
+         catch (ClosedChannelException e)
+         {
+            //this is ok too, we are being stopped
+         }
          catch (Exception e)
          {
             if(!(e.getCause() instanceof InterruptedException))
@@ -522,7 +527,7 @@
          return;
       }
 
-      HornetQServerImpl.log.info((configuration.isBackup() ? "backup" : "live") + " server is starting..");
+      HornetQServerImpl.log.info((configuration.isBackup() ? "backup" : "live") + " server is starting with configuration " + configuration);
 
       if (configuration.isRunSyncSpeedTest())
       {
@@ -530,7 +535,7 @@
 
          test.run();
       }
-
+      
       if (!configuration.isBackup())
       {
          if (configuration.isSharedStore())