Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "On openflow plugin restart, NPE in tx poller"
[controller.git]
/
opendaylight
/
config
/
config-manager
/
src
/
main
/
java
/
org
/
opendaylight
/
controller
/
config
/
manager
/
impl
/
jmx
/
BaseJMXRegistrator.java
diff --git
a/opendaylight/config/config-manager/src/main/java/org/opendaylight/controller/config/manager/impl/jmx/BaseJMXRegistrator.java
b/opendaylight/config/config-manager/src/main/java/org/opendaylight/controller/config/manager/impl/jmx/BaseJMXRegistrator.java
index 09bc1f818fc563ae11e432cec37e148459a2e7dd..d09fc75d7374f4aef55d96a08ebb291322512d4b 100644
(file)
--- a/
opendaylight/config/config-manager/src/main/java/org/opendaylight/controller/config/manager/impl/jmx/BaseJMXRegistrator.java
+++ b/
opendaylight/config/config-manager/src/main/java/org/opendaylight/controller/config/manager/impl/jmx/BaseJMXRegistrator.java
@@
-14,7
+14,7
@@
import javax.management.ObjectName;
import javax.management.QueryExp;
import java.util.Set;
import javax.management.QueryExp;
import java.util.Set;
-public class BaseJMXRegistrator implements AutoCloseable {
+public class BaseJMXRegistrator implements AutoCloseable
, NestableJMXRegistrator
{
private final InternalJMXRegistrator internalJMXRegistrator;
private final InternalJMXRegistrator internalJMXRegistrator;
@@
-50,6
+50,11
@@
public class BaseJMXRegistrator implements AutoCloseable {
return internalJMXRegistrator.getRegisteredObjectNames();
}
return internalJMXRegistrator.getRegisteredObjectNames();
}
+ @Override
+ public InternalJMXRegistrator createChild() {
+ return internalJMXRegistrator.createChild();
+ }
+
@Override
public void close() {
internalJMXRegistrator.close();
@Override
public void close() {
internalJMXRegistrator.close();