svn commit: r1138056 - in /wicket/trunk/wicket-jmx/src/main/java/org/apache/wicket/jmx: Application.java ResourceSettings.java

[pete]

Author: pete
Date: Tue Jun 21 15:37:53 2011
New Revision: 1138056

URL: http://svn.apache.org/viewvc?rev=1138056&view=rev
Log:
WICKET-3822 some jmx values are not working since they require wickets filter 
environment (application, session, etc.)

Modified:
    wicket/trunk/wicket-jmx/src/main/java/org/apache/wicket/jmx/Application.java
    
wicket/trunk/wicket-jmx/src/main/java/org/apache/wicket/jmx/ResourceSettings.java

Modified: 
wicket/trunk/wicket-jmx/src/main/java/org/apache/wicket/jmx/Application.java
URL: 
http://svn.apache.org/viewvc/wicket/trunk/wicket-jmx/src/main/java/org/apache/wicket/jmx/Application.java?rev=1138056&r1=1138055&r2=1138056&view=diff
==============================================================================
--- 
wicket/trunk/wicket-jmx/src/main/java/org/apache/wicket/jmx/Application.java 
(original)
+++ 
wicket/trunk/wicket-jmx/src/main/java/org/apache/wicket/jmx/Application.java 
Tue Jun 21 15:37:53 2011
@@ -18,6 +18,8 @@ package org.apache.wicket.jmx;
 
 import java.io.IOException;
 
+import org.apache.wicket.ThreadContext;
+
 /**
  * Exposes Application related functionality for JMX.
  * 
@@ -74,7 +76,16 @@ public class Application implements Appl
         */
        public int getMarkupCacheSize() throws IOException
        {
-               return 
application.getMarkupSettings().getMarkupFactory().getMarkupCache().size();
+               ThreadContext.setApplication(application);
+               
+               try
+               {
+                       return 
application.getMarkupSettings().getMarkupFactory().getMarkupCache().size();
+               }
+               finally
+               {
+                       ThreadContext.detach();
+               }
        }
 
        /**

Modified: 
wicket/trunk/wicket-jmx/src/main/java/org/apache/wicket/jmx/ResourceSettings.java
URL: 
http://svn.apache.org/viewvc/wicket/trunk/wicket-jmx/src/main/java/org/apache/wicket/jmx/ResourceSettings.java?rev=1138056&r1=1138055&r2=1138056&view=diff
==============================================================================
--- 
wicket/trunk/wicket-jmx/src/main/java/org/apache/wicket/jmx/ResourceSettings.java
 (original)
+++ 
wicket/trunk/wicket-jmx/src/main/java/org/apache/wicket/jmx/ResourceSettings.java
 Tue Jun 21 15:37:53 2011
@@ -18,6 +18,7 @@ package org.apache.wicket.jmx;
 
 import java.util.List;
 
+import org.apache.wicket.ThreadContext;
 import org.apache.wicket.resource.loader.IStringResourceLoader;
 import org.apache.wicket.util.lang.Generics;
 import org.apache.wicket.util.time.Duration;
@@ -63,7 +64,16 @@ public class ResourceSettings implements
         */
        public String getPropertiesFactory()
        {
-               return 
Stringz.className(application.getResourceSettings().getPropertiesFactory());
+               ThreadContext.setApplication(application);
+               
+               try
+               {
+                       return 
Stringz.className(application.getResourceSettings().getPropertiesFactory());
+               }
+               finally
+               {
+                       ThreadContext.detach();
+               }
        }
 
        /**