You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by or...@apache.org on 2015/08/11 12:32:58 UTC
svn commit: r1695241 - in /qpid/java/trunk/broker-plugins:
management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagement.java
management-jmx/src/main/java/org/apache/qpid/server/jmx/JMXManagementPluginImpl.java
Author: orudyy
Date: Tue Aug 11 10:32:58 2015
New Revision: 1695241
URL: http://svn.apache.org/r1695241
Log:
QPID-6688: [Java Broker] Add port state check in HTTP and JMX management plugins whilst iterating through ports in order to avoid NPE thrown for Ports in ERRORED state having uninitialized protocols
Modified:
qpid/java/trunk/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagement.java
qpid/java/trunk/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/JMXManagementPluginImpl.java
Modified: qpid/java/trunk/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagement.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagement.java?rev=1695241&r1=1695240&r2=1695241&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagement.java (original)
+++ qpid/java/trunk/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagement.java Tue Aug 11 10:32:58 2015
@@ -557,7 +557,7 @@ public class HttpManagement extends Abst
Collection<Port<?>> httpPorts = new HashSet<>();
for (Port<?> port : ports)
{
- if (port.getProtocols().contains(Protocol.HTTP))
+ if (port.getState() != State.ERRORED && port.getProtocols().contains(Protocol.HTTP))
{
httpPorts.add(port);
}
Modified: qpid/java/trunk/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/JMXManagementPluginImpl.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/JMXManagementPluginImpl.java?rev=1695241&r1=1695240&r2=1695241&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/JMXManagementPluginImpl.java (original)
+++ qpid/java/trunk/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/JMXManagementPluginImpl.java Tue Aug 11 10:32:58 2015
@@ -119,7 +119,7 @@ public class JMXManagementPluginImpl
Collection<Port<?>> ports = broker.getPorts();
for (Port<?> port : ports)
{
- if (port.getDesiredState() != State.ACTIVE)
+ if (port.getDesiredState() != State.ACTIVE || port.getState() == State.ERRORED)
{
continue;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org