summaryrefslogtreecommitdiff
path: root/qpid/java
diff options
context:
space:
mode:
authorAlex Rudyy <orudyy@apache.org>2013-05-17 15:26:26 +0000
committerAlex Rudyy <orudyy@apache.org>2013-05-17 15:26:26 +0000
commit421c258a67e6245b427a3798653729a677375903 (patch)
tree8fe05a2b900895d1a204ec296f1bcbb4d48222de /qpid/java
parent43e1b76083c945f04d4eeb827d0b9d9cf7f15263 (diff)
downloadqpid-python-421c258a67e6245b427a3798653729a677375903.tar.gz
QPID-4739: Remove redundant validation of keystore attributes as they are validated at keystore creation
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1483862 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/java')
-rw-r--r--qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagement.java22
1 files changed, 0 insertions, 22 deletions
diff --git a/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagement.java b/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagement.java
index d41b505d23..e0135d26aa 100644
--- a/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagement.java
+++ b/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagement.java
@@ -244,7 +244,6 @@ public class HttpManagement extends AbstractPluginAdapter implements HttpManagem
}
String keyStorePath = (String)keyStore.getAttribute(KeyStore.PATH);
String keyStorePassword = keyStore.getPassword();
- validateKeystoreParameters(keyStorePath, keyStorePassword);
SslContextFactory factory = new SslContextFactory();
factory.setKeyStorePath(keyStorePath);
@@ -328,27 +327,6 @@ public class HttpManagement extends AbstractPluginAdapter implements HttpManagem
root.addServlet(new ServletHolder(new RestServlet(hierarchy)), "/rest/" + name + "/*");
}
- private void validateKeystoreParameters(String keyStorePath, String password)
- {
- if (keyStorePath == null)
- {
- throw new RuntimeException("SSL keystore path not defined, unable to start HTTPS connector");
- }
- if (password == null)
- {
- throw new RuntimeException("SSL keystore password not defined, unable to start HTTPS connector");
- }
- File ksf = new File(keyStorePath);
- if (!ksf.exists())
- {
- throw new RuntimeException("Cannot find SSL keystore file for HTTPS management: " + ksf);
- }
- if (!ksf.canRead())
- {
- throw new RuntimeException("Cannot read SSL keystore file for HTTPS management: " + ksf + ". Check permissions.");
- }
- }
-
private void logOperationalListenMessages(Server server)
{
Connector[] connectors = server.getConnectors();