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

[do-not-reply at jboss.org]

Author: clebert.suconic at jboss.com
Date: 2011-01-12 18:59:09 -0500 (Wed, 12 Jan 2011)
New Revision: 10117

Modified:
   trunk/src/main/org/hornetq/core/security/impl/SecurityStoreImpl.java
   trunk/src/main/org/hornetq/core/server/impl/HornetQServerImpl.java
Log:
JBPAPP-5659 - fixing dependency on security roles on backup nodes

Modified: trunk/src/main/org/hornetq/core/security/impl/SecurityStoreImpl.java
===================================================================
--- trunk/src/main/org/hornetq/core/security/impl/SecurityStoreImpl.java	2011-01-12 04:03:22 UTC (rev 10116)
+++ trunk/src/main/org/hornetq/core/security/impl/SecurityStoreImpl.java	2011-01-12 23:59:09 UTC (rev 10117)
@@ -185,10 +185,10 @@
             }
 
             throw new HornetQException(HornetQException.SECURITY_EXCEPTION,
-                                       "Unable to validate user: " + session.getUsername() +
-                                                " for check type " +
+                                       "User: " + session.getUsername() +
+                                                " doesn't have permission='" +
                                                 checkType +
-                                                " for address " +
+                                                "' on address " +
                                                 saddress);
          }
          // if we get here we're granted, add to the cache

Modified: trunk/src/main/org/hornetq/core/server/impl/HornetQServerImpl.java
===================================================================
--- trunk/src/main/org/hornetq/core/server/impl/HornetQServerImpl.java	2011-01-12 04:03:22 UTC (rev 10116)
+++ trunk/src/main/org/hornetq/core/server/impl/HornetQServerImpl.java	2011-01-12 23:59:09 UTC (rev 10117)
@@ -1378,11 +1378,9 @@
             securityDeployer.start();
          }
       }
-      else
-      {
-         deploySecurityFromConfiguration();
-      }
 
+      deploySecurityFromConfiguration();
+
       deployGroupingHandlerConfiguration(configuration.getGroupingHandlerConfiguration());
 
       // This can't be created until node id is set