diff options
| author | Keith Wall <kwall@apache.org> | 2014-09-05 10:31:02 +0000 |
|---|---|---|
| committer | Keith Wall <kwall@apache.org> | 2014-09-05 10:31:02 +0000 |
| commit | 5754b4f1b7ce045d1f7e08757fd5e1c5e6042aa0 (patch) | |
| tree | bcf674fb0be163ed5555d4f6154fe9f0b25b8897 /qpid/java/broker-core/src | |
| parent | 0ad4deaae4aa9a5045e18d7b16c8a2324705e37f (diff) | |
| download | qpid-python-5754b4f1b7ce045d1f7e08757fd5e1c5e6042aa0.tar.gz | |
QPID-6068: [Java Broker] Prevent NPE when ediiting JMX_CONNECTOR port through REST or Web Management UI
* Also hidden the authentication provider field when editting an RMI port
* Added the missing prompts for transports/protocols.
* Remove the mandatory marker from the protocols field
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1622677 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/java/broker-core/src')
2 files changed, 2 insertions, 10 deletions
diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/port/AbstractPortWithAuthProvider.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/port/AbstractPortWithAuthProvider.java index a959709657..4932c02573 100644 --- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/port/AbstractPortWithAuthProvider.java +++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/port/AbstractPortWithAuthProvider.java @@ -88,18 +88,16 @@ abstract public class AbstractPortWithAuthProvider<X extends AbstractPortWithAut throw new IllegalConfigurationException( "Can't create port which requests SSL client certificates but doesn't use SSL transport."); } - } - @Override protected void validateChange(final ConfiguredObject<?> proxyForValidation, final Set<String> changedAttributes) { super.validateChange(proxyForValidation, changedAttributes); Port<?> updated = (Port<?>)proxyForValidation; - boolean needClientCertificate = (Boolean) updated.getAttribute(NEED_CLIENT_AUTH); - boolean wantClientCertificate = (Boolean) updated.getAttribute(WANT_CLIENT_AUTH); + boolean needClientCertificate = updated.getAttribute(NEED_CLIENT_AUTH) == null ? false : (Boolean) updated.getAttribute(NEED_CLIENT_AUTH); + boolean wantClientCertificate = updated.getAttribute(WANT_CLIENT_AUTH) == null ? false : (Boolean) updated.getAttribute(WANT_CLIENT_AUTH); boolean requiresCertificate = needClientCertificate || wantClientCertificate; boolean usesSsl = updated.getTransports().contains(Transport.SSL); @@ -117,8 +115,5 @@ abstract public class AbstractPortWithAuthProvider<X extends AbstractPortWithAut throw new IllegalConfigurationException("Can't create port which requests SSL client certificates but doesn't use SSL transport."); } } - - - } } diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/port/JmxPortImpl.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/port/JmxPortImpl.java index a235613c29..3e21db23c6 100644 --- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/port/JmxPortImpl.java +++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/port/JmxPortImpl.java @@ -20,13 +20,10 @@ */ package org.apache.qpid.server.model.port; -import java.util.Collections; import java.util.Map; -import java.util.Set; import org.apache.qpid.server.model.Broker; import org.apache.qpid.server.model.ManagedObjectFactoryConstructor; -import org.apache.qpid.server.model.Protocol; import org.apache.qpid.server.model.State; public class JmxPortImpl extends AbstractPortWithAuthProvider<JmxPortImpl> implements JmxPort<JmxPortImpl> |