X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=auth%2Fauth-core%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Faaf%2Fauth%2Fserver%2FJettyServiceStarter.java;fp=auth%2Fauth-core%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Faaf%2Fauth%2Fserver%2FJettyServiceStarter.java;h=cefc7a2348b1a9f4de61525a74bc384bab819780;hb=c060284812fbbc18fcf22eb628c47c251505fe50;hp=4b2ca32cc7a8d3cb9a0b30369b9826109e262776;hpb=2c0dd5c5136e249f63f1d3296063795cde30c399;p=aaf%2Fauthz.git

diff --git a/auth/auth-core/src/main/java/org/onap/aaf/auth/server/JettyServiceStarter.java b/auth/auth-core/src/main/java/org/onap/aaf/auth/server/JettyServiceStarter.java
index 4b2ca32c..cefc7a23 100644
--- a/auth/auth-core/src/main/java/org/onap/aaf/auth/server/JettyServiceStarter.java
+++ b/auth/auth-core/src/main/java/org/onap/aaf/auth/server/JettyServiceStarter.java
@@ -231,11 +231,16 @@ public class JettyServiceStarter<ENV extends RosettaEnv, TRANS extends Trans> ex
 		try {
 			register(service.registrants(port));
 			access().printf(Level.INIT, "Starting Jetty Service for %s, version %s, on %s://%s:%d", service.app_name,service.app_version,protocol,hostname,port);
+			server.join();
 		} catch(Exception e) {
 			access().log(e,"Error registering " + service.app_name);
-			// Question: Should Registered Services terminate?
+			String doExit = access().getProperty("cadi_exitOnFailure", "true");
+			if (doExit == "true") {
+				System.exit(1);
+			} else {
+				throw e;
+			}
 		}
-		server.join();
 	}
 
 	private FilterChain buildFilterChain(final AbsService<?,?> as, final FilterChain doLast) throws CadiException, LocatorException {