svn commit: r1750153 - /uima/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/configuration/service/ServiceComponent.java

[cwiklik]

Author: cwiklik
Date: Fri Jun 24 18:14:11 2016
New Revision: 1750153

URL: http://svn.apache.org/viewvc?rev=1750153&view=rev
Log:
UIMA-2989 fixed dereferencing null found by FindBugs

Modified:
    
uima/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/configuration/service/ServiceComponent.java

Modified: 
uima/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/configuration/service/ServiceComponent.java
URL: 
http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/configuration/service/ServiceComponent.java?rev=1750153&r1=1750152&r2=1750153&view=diff
==============================================================================
--- 
uima/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/configuration/service/ServiceComponent.java
 (original)
+++ 
uima/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/configuration/service/ServiceComponent.java
 Fri Jun 24 18:14:11 2016
@@ -45,7 +45,8 @@ public class ServiceComponent extends Ab
        private String jmxConnectString = "";
        protected ProcessState currentState = ProcessState.Undefined;
        protected ProcessState previousState = ProcessState.Undefined;
-       protected static DuccLogger logger;
+       protected static DuccLogger logger =
+                       new DuccLogger(ServiceComponent.class);
        protected String saxonJarPath;
        protected String dd2SpringXslPath;
        protected String dd;
@@ -101,9 +102,6 @@ public class ServiceComponent extends Ab
        }
 
        public DuccLogger getLogger() {
-               if (logger == null) {
-                       logger = new DuccLogger(ServiceComponent.class);
-               }
                return logger;
        }
 
@@ -207,7 +205,9 @@ public class ServiceComponent extends Ab
 
        public void stop() {
                currentState = ProcessState.Stopping;
-               agent.notify(currentState);
+               if ( agent != null ) {
+                       agent.notify(currentState);
+               }
                if (super.isStopping()) {
                        return; // already stopping - nothing to do
                }