svn commit: r1799403 - /jackrabbit/oak/trunk/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/spi/whiteboard/WhiteboardUtils.java

[tomekr]

Author: tomekr
Date: Wed Jun 21 08:39:30 2017
New Revision: 1799403

URL: http://svn.apache.org/viewvc?rev=1799403&view=rev
Log:
OAK-6375: RevisionGCMbeans are not filtered correctly in the 
RepositoryManagement

Modified:
    
jackrabbit/oak/trunk/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/spi/whiteboard/WhiteboardUtils.java

Modified: 
jackrabbit/oak/trunk/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/spi/whiteboard/WhiteboardUtils.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/spi/whiteboard/WhiteboardUtils.java?rev=1799403&r1=1799402&r2=1799403&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/spi/whiteboard/WhiteboardUtils.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/spi/whiteboard/WhiteboardUtils.java
 Wed Jun 21 08:39:30 2017
@@ -86,9 +86,12 @@ public class WhiteboardUtils {
             Hashtable<String, String> table = new Hashtable<String, 
String>(attrs);
             table.put("type", JmxUtil.quoteValueIfRequired(type));
             table.put("name", JmxUtil.quoteValueIfRequired(name));
-            return whiteboard.register(iface, bean, ImmutableMap.of(
-                    "jmx.objectname",
-                    new ObjectName(JMX_OAK_DOMAIN, table)));
+
+            ImmutableMap.Builder properties = ImmutableMap.builder();
+            properties.put("jmx.objectname", new ObjectName(JMX_OAK_DOMAIN, 
table));
+            properties.putAll(attrs);
+
+            return whiteboard.register(iface, bean, properties.build());
         } catch (MalformedObjectNameException e) {
             throw new IllegalArgumentException(e);
         }