[jboss-cvs] JBoss Messaging SVN: r3233 - in trunk/src/main/org/jboss: messaging/core/impl/postoffice and 1 other directory.

[jboss-cvs-commits at lists.jboss.org]

Author: timfox
Date: 2007-10-21 07:05:42 -0400 (Sun, 21 Oct 2007)
New Revision: 3233

Modified:
   trunk/src/main/org/jboss/jms/client/FailoverCommandCenter.java
   trunk/src/main/org/jboss/messaging/core/impl/postoffice/MessagingPostOffice.java
Log:
Logging and null check


Modified: trunk/src/main/org/jboss/jms/client/FailoverCommandCenter.java
===================================================================
--- trunk/src/main/org/jboss/jms/client/FailoverCommandCenter.java	2007-10-21 10:43:54 UTC (rev 3232)
+++ trunk/src/main/org/jboss/jms/client/FailoverCommandCenter.java	2007-10-21 11:05:42 UTC (rev 3233)
@@ -114,7 +114,7 @@
          
          // Note - failover doesn't occur until _after_ the above check - so the next comment
          // belongs here
-         log.debug(this + " starting client-side failover");
+         log.info("JBoss Messaging server failure detected - waiting for failover to complete...");
          
          // generate a FAILOVER_STARTED event. The event must be broadcasted AFTER valve closure,
          // to insure the client-side stack is in a deterministic state
@@ -161,7 +161,9 @@
                log.trace("Started new connection");
             }
             
-            failoverSuccessful = true;                        
+            failoverSuccessful = true;      
+            
+            log.info("JBoss Messaging failover complete");
          }
          
          log.trace("failureDetected() complete");

Modified: trunk/src/main/org/jboss/messaging/core/impl/postoffice/MessagingPostOffice.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/impl/postoffice/MessagingPostOffice.java	2007-10-21 10:43:54 UTC (rev 3232)
+++ trunk/src/main/org/jboss/messaging/core/impl/postoffice/MessagingPostOffice.java	2007-10-21 11:05:42 UTC (rev 3233)
@@ -2933,7 +2933,10 @@
             if (localNameMap != null)
             {
             	Binding b = (Binding)localNameMap.get(queue.getName());
-            	localQueue = b.queue;
+            	if (b != null)
+            	{
+            		localQueue = b.queue;
+            	}
             }
             	
             if (localQueue != null)