JBPAPP-7829 fixing NPE on Security Test

hornetq · Jan 5, 2012 · 22a4266 · 22a4266
1 parent 6a87570
commit 22a4266
Showing 1 changed file with 7 additions and 6 deletions.
diff --git a/src/main/org/hornetq/core/server/impl/ServerSessionImpl.java b/src/main/org/hornetq/core/server/impl/ServerSessionImpl.java
@@ -1105,12 +1105,17 @@ public void sendLarge(final MessageInternal message) throws Exception
    public void send(final ServerMessage message, final boolean direct) throws Exception
    {
       long id = storageManager.generateUniqueID();
-
+      
       SimpleString address = message.getAddress();
 
       message.setMessageID(id);
       message.encodeMessageIDToBuffer();
 
+      if (defaultAddress == null && address != null)
+      {
+         defaultAddress = address;
+      }
+
       if (address == null)
       {
          if (message.isDurable())
@@ -1131,6 +1136,7 @@ public void send(final ServerMessage message, final boolean direct) throws Excep
          log.trace("send(message=" + message + ", direct=" + direct + ") being called");
       }
 
+      log.info("message " + message + " managementAddress = " + managementAddress);
       if (message.getAddress().equals(managementAddress))
       {
          // It's a management message
@@ -1141,11 +1147,6 @@ public void send(final ServerMessage message, final boolean direct) throws Excep
       {
          doSend(message, direct);
       }
-
-      if (defaultAddress == null)
-      {
-         defaultAddress = address;
-      }
    }
 
    public void sendContinuations(final int packetSize,