Changes for certificate handling

aws-samples · Apr 15, 2019 · 64880c1 · 64880c1
1 parent 70e44d4
commit 64880c1
Showing 1 changed file with 14 additions and 9 deletions.
diff --git a/services/tracking-service/reactive-vertx/src/main/java/com/amazon/BootStrapVerticle.java b/services/tracking-service/reactive-vertx/src/main/java/com/amazon/BootStrapVerticle.java
@@ -36,27 +36,32 @@ public class BootStrapVerticle extends AbstractVerticle {
 
     static {
         java.security.Security.setProperty("networkaddress.cache.ttl", "60");
+    }
+
+    public static void main (String ... args) {
+        Vertx vertx = Vertx.vertx();
+        vertx.deployVerticle(new BootStrapVerticle());
+    }
+
+    @Override
+    public void start(Future<Void> startFuture) {
+
         String trustStoreLocation = getenv("javax.net.ssl.trustStore");
         String trustAnchorsLocation = getenv("javax.net.ssl.trustAnchors");
 
         if (null != trustStoreLocation) {
             LOGGER.info("Setting javax.net.ssl.trustStore to " + trustStoreLocation);
             System.setProperty("javax.net.ssl.trustStore", trustStoreLocation);
+        } else {
+            LOGGER.info("Setting javax.net.ssl.trustStore not set");
         }
 
         if (null != trustAnchorsLocation) {
             LOGGER.info("Setting javax.net.ssl.trustAnchors to " + trustAnchorsLocation);
             System.setProperty("javax.net.ssl.trustAnchors", trustAnchorsLocation);
+        } else {
+            LOGGER.info("Setting javax.net.ssl.trustAnchors not set");
         }
-    }
-
-    public static void main (String ... args) {
-        Vertx vertx = Vertx.vertx();
-        vertx.deployVerticle(new BootStrapVerticle());
-    }
-
-    @Override
-    public void start(Future<Void> startFuture) {
 
         List<Future> futures = Stream.generate(Future::<String>future).limit(4)
                 .collect(Collectors.toList());