Author: robbie
Date: Mon May 20 11:07:16 2013
New Revision: 1484428
URL: http://svn.apache.org/r1484428
Log:
QPID-4739: Remove redundant validation of keystore attributes as they are
validated at keystore creation
merged from trunk r1483862
Modified:
qpid/branches/0.22/qpid/java/ (props changed)
qpid/branches/0.22/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagement.java
Propchange: qpid/branches/0.22/qpid/java/
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java:r1483862
Modified:
qpid/branches/0.22/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagement.java
URL:
http://svn.apache.org/viewvc/qpid/branches/0.22/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagement.java?rev=1484428&r1=1484427&r2=1484428&view=diff
==============================================================================
---
qpid/branches/0.22/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagement.java
(original)
+++
qpid/branches/0.22/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagement.java
Mon May 20 11:07:16 2013
@@ -244,7 +244,6 @@ public class HttpManagement extends Abst
}
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 Abst
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();
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
