X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=auth%2Fauth-core%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Faaf%2Fauth%2Fserver%2FAbsServiceStarter.java;h=af549356cb361d37da4ea9fa515d298744d5460a;hb=HEAD;hp=90f4158fe1088247a8299aa8e0f6385d30dfca97;hpb=3d1706fcbe7f95830ff6fd23cf679ee55c6d0595;p=aaf%2Fauthz.git

diff --git a/auth/auth-core/src/main/java/org/onap/aaf/auth/server/AbsServiceStarter.java b/auth/auth-core/src/main/java/org/onap/aaf/auth/server/AbsServiceStarter.java
index 90f4158f..af549356 100644
--- a/auth/auth-core/src/main/java/org/onap/aaf/auth/server/AbsServiceStarter.java
+++ b/auth/auth-core/src/main/java/org/onap/aaf/auth/server/AbsServiceStarter.java
@@ -7,9 +7,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -40,7 +40,7 @@ import org.onap.aaf.misc.rosetta.env.RosettaEnv;
 
 public abstract class AbsServiceStarter<ENV extends RosettaEnv, TRANS extends Trans> implements ServiceStarter {
     private Registrar<ENV> registrar;
-    private boolean do_register;
+    private boolean doRegister;
     protected AbsService<ENV,TRANS> service;
     protected String hostname;
     protected final boolean secure;
@@ -57,7 +57,7 @@ public abstract class AbsServiceStarter<ENV extends RosettaEnv, TRANS extends Tr
         }
         // do_register - this is used for specialty Debug Situations.  Developer can create an Instance for a remote system
         // for Debugging purposes without fear that real clients will start to call your debug instance
-        do_register = !"TRUE".equalsIgnoreCase(access().getProperty("aaf_locate_no_register",null));
+        doRegister = !"TRUE".equalsIgnoreCase(access().getProperty("aaf_locate_no_register",null));
         hostname = access().getProperty(Config.HOSTNAME, null);
         if (hostname==null) {
             try {
@@ -68,15 +68,15 @@ public abstract class AbsServiceStarter<ENV extends RosettaEnv, TRANS extends Tr
         }
         _propertyAdjustment();
     }
-    
-    
+
+
     protected abstract void _start(RServlet<TRANS> rserv) throws Exception;
     protected abstract void _propertyAdjustment();
-    
+
     public ENV env() {
         return service.env;
     }
-    
+
     public Access access() {
         return service.access;
     }
@@ -86,12 +86,12 @@ public abstract class AbsServiceStarter<ENV extends RosettaEnv, TRANS extends Tr
         ExecutorService es = Executors.newSingleThreadExecutor();
         Future<?> app = es.submit(this);
         final AbsServiceStarter<?,?> absSS = this;
-        // Docker/K8 may separately create startup Status in this dir for startup 
-        // sequencing.  If so, delete ON EXIT 
+        // Docker/K8 may separately create startup Status in this dir for startup
+        // sequencing.  If so, delete ON EXIT
         Runtime.getRuntime().addShutdownHook(new Thread() {
           @Override
           public void run() {
-              absSS.access().printf(Level.INIT, "Shutting down %s:%s\n",absSS.service.app_name, absSS.service.app_version);
+              absSS.access().printf(Level.INIT, "Shutting down %s:%s\n",absSS.service.appName, absSS.service.appVersion);
               absSS.shutdown();
               app.cancel(true);
           }
@@ -109,10 +109,10 @@ public abstract class AbsServiceStarter<ENV extends RosettaEnv, TRANS extends Tr
             }
         }
     }
-    
+
     @SafeVarargs
     public final synchronized void register(final Registrant<ENV> ... registrants) {
-        if (do_register) {
+        if (doRegister) {
             if (registrar==null) {
                 registrar = new Registrar<ENV>(env(),false);
             }
@@ -137,17 +137,17 @@ public abstract class AbsServiceStarter<ENV extends RosettaEnv, TRANS extends Tr
         if (registrar!=null) {
             registrar.close(env());
             registrar=null;
-        } 
+        }
         if (service!=null) {
             File status = new File("/opt/app/aaf/status/");
             boolean deleted = false;
             if(status.exists()) {
-                int lastdot = service.app_name.lastIndexOf("aaf.");
+                int lastdot = service.appName.lastIndexOf("aaf.");
                 String fname;
                 if(lastdot<0) {
-                    fname = service.app_name + '-' + hostname;
+                    fname = service.appName + '-' + hostname;
                 } else {
-                    fname = service.app_name.substring(lastdot).replace('.', '-') 
+                    fname = service.appName.substring(lastdot).replace('.', '-')
                             + '-' + hostname;
                 }
                 status = new File(status, fname);
@@ -157,7 +157,7 @@ public abstract class AbsServiceStarter<ENV extends RosettaEnv, TRANS extends Tr
             }
             if(deleted) {
                 service.access.log(Level.INIT, "Deleted Status",status.getAbsolutePath());
-            } else {
+            } else if(status.exists()) {
                 service.access.log(Level.INIT, "Status not deleted: ",status.getAbsolutePath());
             }
             service.destroy();