[jboss-cvs] JBossAS SVN: r98951 - trunk/security/src/main/java/org/jboss/security/plugins.

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

Author: sguilhen at redhat.com
Date: 2009-12-29 18:52:24 -0500 (Tue, 29 Dec 2009)
New Revision: 98951

Modified:
   trunk/security/src/main/java/org/jboss/security/plugins/SecurityConfig.java
Log:
SECURITY-244: added logging statements to SecurityConfig

Modified: trunk/security/src/main/java/org/jboss/security/plugins/SecurityConfig.java
===================================================================
--- trunk/security/src/main/java/org/jboss/security/plugins/SecurityConfig.java	2009-12-29 20:45:57 UTC (rev 98950)
+++ trunk/security/src/main/java/org/jboss/security/plugins/SecurityConfig.java	2009-12-29 23:52:24 UTC (rev 98951)
@@ -155,8 +155,7 @@
    @ManagementOperation(description = "Service lifecycle operation", impact = Impact.WriteOnly)
    public void stopService() throws Exception
    {
-      if (this.loginConfigStack.empty() == false)
-         popLoginConfig();
+      this.popLoginConfig();
    }
 
    /**
@@ -204,11 +203,29 @@
    @ManagementOperation(description = "Uninstall the current Configuration", impact = Impact.WriteOnly)
    public synchronized void popLoginConfig() throws JMException
    {
+      if(this.loginConfigStack.isEmpty())
+      {
+         if (super.log.isDebugEnabled())
+            super.log.debug("Unable to pop configuration: configuration stack is empty");
+         return;
+      }
+      
       // remove the current configuration from the stack.
-      this.loginConfigStack.pop();
-      // if there is a previous configuration, install it as the current instance.
-      if (!loginConfigStack.empty())
-         Configuration.setConfiguration(this.loginConfigStack.peek());
+      Configuration currentConfig = this.loginConfigStack.pop();
+      if (!this.loginConfigStack.empty())
+      {
+         // if there is a previous configuration, install it as the current instance.
+         Configuration previousConfig = this.loginConfigStack.peek();
+         if (super.log.isDebugEnabled())
+            super.log.debug("Installing previous configuration " + previousConfig.getClass().getName());
+         Configuration.setConfiguration(previousConfig);
+      }
+      else
+      {
+         if(super.log.isDebugEnabled())
+            super.log.debug("No previous configuration found. Configuration " + currentConfig.getClass().getName() + 
+                  " is still active");
+      }
    }
 
    /**