You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by he...@apache.org on 2016/02/01 18:49:08 UTC
[38/50] brooklyn-server git commit: web-console: don't require
truststore if using https
web-console: don't require truststore if using https
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/5e34360d
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/5e34360d
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/5e34360d
Branch: refs/heads/0.4.0
Commit: 5e34360d54da690c9af7eac32226e359780f6615
Parents: e299b11
Author: Aled Sage <al...@gmail.com>
Authored: Thu Oct 11 19:16:10 2012 +0100
Committer: Aled Sage <al...@gmail.com>
Committed: Tue Oct 16 22:23:13 2012 +0100
----------------------------------------------------------------------
.../src/main/java/brooklyn/launcher/BrooklynWebServer.java | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/5e34360d/usage/launcher/src/main/java/brooklyn/launcher/BrooklynWebServer.java
----------------------------------------------------------------------
diff --git a/usage/launcher/src/main/java/brooklyn/launcher/BrooklynWebServer.java b/usage/launcher/src/main/java/brooklyn/launcher/BrooklynWebServer.java
index 98d5160..5c10339 100644
--- a/usage/launcher/src/main/java/brooklyn/launcher/BrooklynWebServer.java
+++ b/usage/launcher/src/main/java/brooklyn/launcher/BrooklynWebServer.java
@@ -25,6 +25,7 @@ import brooklyn.util.ResourceUtils;
import brooklyn.util.flags.FlagUtils;
import brooklyn.util.flags.SetFromFlag;
import brooklyn.util.flags.TypeCoercions;
+import brooklyn.util.text.Strings;
import brooklyn.util.web.ContextHandlerCollectionHotSwappable;
import com.google.common.base.Throwables;
@@ -191,8 +192,10 @@ public class BrooklynWebServer {
SslContextFactory sslContextFactory = new SslContextFactory();
sslContextFactory.setKeyStore(checkFileExists(keystorePath, "keystore"));
sslContextFactory.setKeyStorePassword(keystorePassword);
- sslContextFactory.setTrustStore(checkFileExists(truststorePath, "truststore"));
- sslContextFactory.setTrustStorePassword(trustStorePassword);
+ if (!Strings.isEmpty(truststorePath)) {
+ sslContextFactory.setTrustStore(checkFileExists(truststorePath, "truststore"));
+ sslContextFactory.setTrustStorePassword(trustStorePassword);
+ }
SslSocketConnector sslSocketConnector = new SslSocketConnector(sslContextFactory);
sslSocketConnector.setPort(actualPort);