svn commit: r949313 - /tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/MBeanSupportImpl.java

[dr...@apache.org]

Author: drobiazko
Date: Fri May 28 22:30:06 2010
New Revision: 949313

URL: http://svn.apache.org/viewvc?rev=949313&view=rev
Log:
Register PagePool MBean only if not registered yet

Modified:
    tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/MBeanSupportImpl.java

Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/MBeanSupportImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/MBeanSupportImpl.java?rev=949313&r1=949312&r2=949313&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/MBeanSupportImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/MBeanSupportImpl.java Fri May 28 22:30:06 2010
@@ -61,6 +61,9 @@ public class MBeanSupportImpl implements
     {
         lock.check();
         
+        if (this.server.isRegistered(objectName))
+            return;
+        
         try
         {
             this.server.registerMBean(object, objectName);
@@ -79,13 +82,18 @@ public class MBeanSupportImpl implements
     {
         lock.check();
         
+        doUnregister(objectName);
+    }
+    
+    private void doUnregister(final ObjectName objectName)
+    {
         if (this.server.isRegistered(objectName))
         {
             try
             {
                 this.server.unregisterMBean(objectName);
 
-                this.logger.info(format("Unegistered MBean '%s' from server", objectName));
+                this.logger.info(format("Unregistered MBean '%s' from server", objectName));
                 
                 if(registeredBeans.contains(objectName))
                     registeredBeans.remove(objectName);
@@ -103,7 +111,7 @@ public class MBeanSupportImpl implements
         
         for (final ObjectName name : this.registeredBeans)
         {
-            unregister(name);
+            doUnregister(name);
         }
 
         this.registeredBeans.clear();