diff options
Diffstat (limited to 'qpid/java/broker-plugins')
2 files changed, 2 insertions, 2 deletions
diff --git a/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/QpidRMIServerSocketFactory.java b/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/QpidRMIServerSocketFactory.java index 54ddf75044..2ad4f6af74 100644 --- a/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/QpidRMIServerSocketFactory.java +++ b/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/QpidRMIServerSocketFactory.java @@ -71,6 +71,6 @@ class QpidRMIServerSocketFactory implements RMIServerSocketFactory @Override public boolean equals(final Object obj) { - return getClass() == obj.getClass(); + return obj != null && getClass() == obj.getClass(); } }
\ No newline at end of file diff --git a/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/RegistryProtectingRMIServerSocketFactory.java b/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/RegistryProtectingRMIServerSocketFactory.java index 45c65faf59..432d84fc42 100644 --- a/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/RegistryProtectingRMIServerSocketFactory.java +++ b/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/RegistryProtectingRMIServerSocketFactory.java @@ -64,7 +64,7 @@ class RegistryProtectingRMIServerSocketFactory implements RMIServerSocketFactory @Override public boolean equals(final Object obj) { - return getClass() == obj.getClass(); + return obj != null && getClass() == obj.getClass(); } private static class NoLocalAddressServerSocket extends ServerSocket |