Merge pull request #81 from j-baker/jbaker/dont_assume_that_ssl_excep…

…tions_are_success Don't assume that an SSL exception when health checking a container means it's up.
palantir · Jun 23, 2016 · e424137 · e424137
2 parents 1aed4aa + bbe06eb
commit e424137
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/main/java/com/palantir/docker/compose/connection/DockerPort.java b/src/main/java/com/palantir/docker/compose/connection/DockerPort.java
@@ -87,8 +87,8 @@ public boolean isHttpResponding(Function<DockerPort, String> urlFunction) {
             log.debug("Received 404, assuming port active");
             return true;
         } catch (SSLHandshakeException e) {
-            log.debug("Received SSL response, assuming port active");
-            return true;
+            log.debug("Received bad SSL response, assuming port inactive");
+            return false;
         } catch (IOException e) {
             log.trace("Error acquiring http connection, assuming port open but inactive", e);
             return false;