svn commit: r1750496 - in /uima/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container: common/fsm/Fsm.java jd/JobDriver.java jd/blacklist/JobProcessBlacklist.java

[degenaro]

Author: degenaro
Date: Tue Jun 28 12:40:39 2016
New Revision: 1750496

URL: http://svn.apache.org/viewvc?rev=1750496&view=rev
Log:
UIMA-4989 Fix problems found by FindBugs

Modified:
    
uima/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/common/fsm/Fsm.java
    
uima/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/JobDriver.java
    
uima/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/blacklist/JobProcessBlacklist.java

Modified: 
uima/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/common/fsm/Fsm.java
URL: 
http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/common/fsm/Fsm.java?rev=1750496&r1=1750495&r2=1750496&view=diff
==============================================================================
--- 
uima/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/common/fsm/Fsm.java
 (original)
+++ 
uima/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/common/fsm/Fsm.java
 Tue Jun 28 12:40:39 2016
@@ -152,7 +152,7 @@ public class Fsm implements IFsmBuilder
        @Override
        public void transition(IEvent event, Object actionData) throws 
FsmException {
                try {
-                       synchronized(map) {
+                       synchronized(this) {
                                IState _stateCurrent = getStateCurrent();
                                IStateEventKey key = new 
StateEventKey(_stateCurrent, event);
                                IStateEventValue value = get(key);
@@ -181,7 +181,7 @@ public class Fsm implements IFsmBuilder
        public void reset() throws FsmException {
                String location = "reset";
                try {
-                       synchronized(map) {
+                       synchronized(this) {
                                IState _stateCurrent = getStateInitial();
                                IState _statePrevious = getStateCurrent();
                                if(!_stateCurrent.equals(_statePrevious)) {

Modified: 
uima/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/JobDriver.java
URL: 
http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/JobDriver.java?rev=1750496&r1=1750495&r2=1750496&view=diff
==============================================================================
--- 
uima/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/JobDriver.java
 (original)
+++ 
uima/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/JobDriver.java
 Tue Jun 28 12:40:39 2016
@@ -214,7 +214,7 @@ public class JobDriver {
        }
        
        public JdState getJdState() {
-               synchronized(jdState) {
+               synchronized(this) {
                        return jdState;
                }
        }
@@ -224,7 +224,7 @@ public class JobDriver {
                String request = value.name();
                String current = null;
                String result = null;
-               synchronized(jdState) {
+               synchronized(this) {
                        current = jdState.name();
                        switch(jdState) {
                        case Ended:

Modified: 
uima/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/blacklist/JobProcessBlacklist.java
URL: 
http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/blacklist/JobProcessBlacklist.java?rev=1750496&r1=1750495&r2=1750496&view=diff
==============================================================================
--- 
uima/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/blacklist/JobProcessBlacklist.java
 (original)
+++ 
uima/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/blacklist/JobProcessBlacklist.java
 Tue Jun 28 12:40:39 2016
@@ -45,9 +45,8 @@ public class JobProcessBlacklist {
                String location = "add";
                if(!disabled) {
                        if(rwp != null) {
-                               if(!map.containsKey(rwp)) {
-                                       Long time = new 
Long(System.currentTimeMillis());
-                                       map.put(rwp, time);
+                               Long time = map.putIfAbsent(rwp, new 
Long(System.currentTimeMillis()));
+                               if(time == null) {
                                        MessageBuffer mb = new MessageBuffer();
                                        
mb.append(Standardize.Label.node.get()+rwp.getNodeName());
                                        
mb.append(Standardize.Label.pid.get()+rwp.getPid());
@@ -87,7 +86,11 @@ public class JobProcessBlacklist {
                return retVal;
        }
        
-       public void disable() {
+       private static void setDisable() {
                disabled = true;
        }
+       
+       public void disable() {
+               setDisable();
+       }
 }