[hornetq-commits] JBoss hornetq SVN: r9810 - trunk/src/main/org/hornetq/core/protocol/stomp.
Author: clebert.suconic(a)jboss.com
Date: 2010-10-25 11:48:41 -0400 (Mon, 25 Oct 2010)
New Revision: 9810
Modified:
trunk/src/main/org/hornetq/core/protocol/stomp/StompProtocolManager.java
Log:
Avoiding NPE because of security manager
Modified: trunk/src/main/org/hornetq/core/protocol/stomp/StompProtocolManager.java
===================================================================
--- trunk/src/main/org/hornetq/core/protocol/stomp/StompProtocolManager.java 2010-10-22
19:40:19 UTC (rev 9809)
+++ trunk/src/main/org/hornetq/core/protocol/stomp/StompProtocolManager.java 2010-10-25
15:48:41 UTC (rev 9810)
@@ -39,6 +39,7 @@
import org.hornetq.spi.core.protocol.ProtocolManager;
import org.hornetq.spi.core.protocol.RemotingConnection;
import org.hornetq.spi.core.remoting.Connection;
+import org.hornetq.spi.core.security.HornetQSecurityManager;
import org.hornetq.utils.UUIDGenerator;
/**
@@ -577,7 +578,14 @@
String clientID = (String)headers.get(Stomp.Headers.Connect.CLIENT_ID);
String requestID = (String)headers.get(Stomp.Headers.Connect.REQUEST_ID);
- server.getSecurityManager().validateUser(login, passcode);
+ HornetQSecurityManager sm = server.getSecurityManager();
+
+ // The sm will be null case security is not enabled...
+ if (sm != null)
+ {
+ sm.validateUser(login, passcode);
+ server.getSecurityManager().validateUser(login, passcode);
+ }
connection.setLogin(login);
connection.setPasscode(passcode);