You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by rg...@apache.org on 2012/04/07 20:03:17 UTC

svn commit: r1310808 - /qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/rmi/RMIPasswordAuthenticator.java

Author: rgodfrey
Date: Sat Apr  7 18:03:17 2012
New Revision: 1310808

URL: http://svn.apache.org/viewvc?rev=1310808&view=rev
Log:
NO-JIRA : [Java Config] fixed failing test

Modified:
    qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/rmi/RMIPasswordAuthenticator.java

Modified: qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/rmi/RMIPasswordAuthenticator.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/rmi/RMIPasswordAuthenticator.java?rev=1310808&r1=1310807&r2=1310808&view=diff
==============================================================================
--- qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/rmi/RMIPasswordAuthenticator.java (original)
+++ qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/rmi/RMIPasswordAuthenticator.java Sat Apr  7 18:03:17 2012
@@ -84,11 +84,18 @@ public class RMIPasswordAuthenticator im
         // Verify that an AuthenticationManager has been set.
         if (_authenticationManager == null)
         {
-            if(ApplicationRegistry.getInstance() != null && ApplicationRegistry.getInstance().getAuthenticationManager() != null)
+            try
             {
-                _authenticationManager = ApplicationRegistry.getInstance().getAuthenticationManager();
+                if(ApplicationRegistry.getInstance().getAuthenticationManager() != null)
+                {
+                    _authenticationManager = ApplicationRegistry.getInstance().getAuthenticationManager();
+                }
+                else
+                {
+                    throw new SecurityException(UNABLE_TO_LOOKUP);
+                }
             }
-            else
+            catch(IllegalStateException e)
             {
                 throw new SecurityException(UNABLE_TO_LOOKUP);
             }



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org