svn commit: r1728048 - /sling/trunk/bundles/jcr/resource/src/main/java/org/apache/sling/jcr/resource/internal/OakResourceListener.java

[ro...@apache.org]

Author: rombert
Date: Tue Feb  2 08:04:16 2016
New Revision: 1728048

URL: http://svn.apache.org/viewvc?rev=1728048&view=rev
Log:
SLING-5163 - Rewrite the JCR Resource to post events using the new
observation API 

Fix JMX bean registration

Modified:
    sling/trunk/bundles/jcr/resource/src/main/java/org/apache/sling/jcr/resource/internal/OakResourceListener.java

Modified: sling/trunk/bundles/jcr/resource/src/main/java/org/apache/sling/jcr/resource/internal/OakResourceListener.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/resource/src/main/java/org/apache/sling/jcr/resource/internal/OakResourceListener.java?rev=1728048&r1=1728047&r2=1728048&view=diff
==============================================================================
--- sling/trunk/bundles/jcr/resource/src/main/java/org/apache/sling/jcr/resource/internal/OakResourceListener.java (original)
+++ sling/trunk/bundles/jcr/resource/src/main/java/org/apache/sling/jcr/resource/internal/OakResourceListener.java Tue Feb  2 08:04:16 2016
@@ -30,6 +30,8 @@ import java.util.concurrent.Executor;
 
 import javax.jcr.RepositoryException;
 import javax.jcr.Session;
+import javax.management.MalformedObjectNameException;
+import javax.management.ObjectName;
 
 import org.apache.jackrabbit.oak.plugins.observation.NodeObserver;
 import org.apache.jackrabbit.oak.spi.commit.BackgroundObserver;
@@ -103,7 +105,12 @@ public class OakResourceListener extends
         final Dictionary<String, Object> mbeanProps = new Hashtable<String, Object>(props);
         String objectName = String.format("org.apache.sling:type=%s,name=SlingResourceListener",
                 BackgroundObserverMBean.TYPE);
-        mbeanProps.put("jmx.objectname", objectName);
+        try {
+            mbeanProps.put("jmx.objectname", new ObjectName(objectName));
+        } catch (MalformedObjectNameException e) {
+            // should not happen
+            throw new RuntimeException(e);
+        }
 
         mbeanRegistration = bundleContext.registerService(BackgroundObserverMBean.class.getName(), observer.getMBean(), mbeanProps);
     }