svn commit: r1750807 - in /uima/uima-ducc/trunk/uima-ducc-examples/src/main/java/org/apache/uima/ducc/test: randomsleep/FixedSleepAE.java randomsleep/FixedSleepCR.java service/AnonymousService.java

[degenaro]

Author: degenaro
Date: Thu Jun 30 14:42:26 2016
New Revision: 1750807

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

Modified:
    
uima/uima-ducc/trunk/uima-ducc-examples/src/main/java/org/apache/uima/ducc/test/randomsleep/FixedSleepAE.java
    
uima/uima-ducc/trunk/uima-ducc-examples/src/main/java/org/apache/uima/ducc/test/randomsleep/FixedSleepCR.java
    
uima/uima-ducc/trunk/uima-ducc-examples/src/main/java/org/apache/uima/ducc/test/service/AnonymousService.java

Modified: 
uima/uima-ducc/trunk/uima-ducc-examples/src/main/java/org/apache/uima/ducc/test/randomsleep/FixedSleepAE.java
URL: 
http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-examples/src/main/java/org/apache/uima/ducc/test/randomsleep/FixedSleepAE.java?rev=1750807&r1=1750806&r2=1750807&view=diff
==============================================================================
--- 
uima/uima-ducc/trunk/uima-ducc-examples/src/main/java/org/apache/uima/ducc/test/randomsleep/FixedSleepAE.java
 (original)
+++ 
uima/uima-ducc/trunk/uima-ducc-examples/src/main/java/org/apache/uima/ducc/test/randomsleep/FixedSleepAE.java
 Thu Jun 30 14:42:26 2016
@@ -237,7 +237,6 @@ public class FixedSleepAE extends CasAnn
     /**
      * This thows all kinds of stuff.
      */
-    @SuppressWarnings("null")
     void throwAnException(String msgheader)
     {
         int MAX_EXCEPTIONS = 7;        // deliberately wrong, this is a 
foul-up simulator after all!

Modified: 
uima/uima-ducc/trunk/uima-ducc-examples/src/main/java/org/apache/uima/ducc/test/randomsleep/FixedSleepCR.java
URL: 
http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-examples/src/main/java/org/apache/uima/ducc/test/randomsleep/FixedSleepCR.java?rev=1750807&r1=1750806&r2=1750807&view=diff
==============================================================================
--- 
uima/uima-ducc/trunk/uima-ducc-examples/src/main/java/org/apache/uima/ducc/test/randomsleep/FixedSleepCR.java
 (original)
+++ 
uima/uima-ducc/trunk/uima-ducc-examples/src/main/java/org/apache/uima/ducc/test/randomsleep/FixedSleepCR.java
 Thu Jun 30 14:42:26 2016
@@ -29,6 +29,7 @@ import java.util.Map;
 import java.util.Properties;
 import java.util.Random;
 import java.util.StringTokenizer;
+import java.util.concurrent.atomic.AtomicInteger;
 
 import org.apache.uima.analysis_engine.AnalysisEngineProcessException;
 import org.apache.uima.cas.CAS;
@@ -59,10 +60,11 @@ public class FixedSleepCR extends Collec
                 
     private volatile Logger logger;
     private volatile ArrayList<Long> workitems;
-    private volatile int index = 0;
     private volatile String logdir = "None";
     private volatile String jobid;
 
+    private AtomicInteger indexProvider = new AtomicInteger(0);
+    
     double error_rate;
     double exit_rate;
     int    bloat;
@@ -197,7 +199,6 @@ public class FixedSleepCR extends Collec
     /**
      * This thows all kinds of stuff.
      */
-    @SuppressWarnings("null")
     void throwAnException(String msgheader)
     {
         int MAX_EXCEPTIONS = 7;        // deliberately wrong, this is a 
foul-up simulator after all!
@@ -314,7 +315,8 @@ public class FixedSleepCR extends Collec
     
     public synchronized void getNext(CAS cas) throws IOException, 
CollectionException 
     {
-
+       int index = indexProvider.getAndIncrement();
+       
         String msgheader = " ****** getNext[" + index + "]: ";
         logger.log(Level.INFO, msgheader + workitems.get(index) + " getNext 
invocation " + get_next_counter++);
         String parm = "" + workitems.get(index) + " " + (index+1) + " " + 
workitems.size() + " " + logdir;
@@ -326,7 +328,6 @@ public class FixedSleepCR extends Collec
         logger.log(Level.INFO, "getNext");
         cas.reset();
         cas.setSofaDataString(parm, "text");
-        index++;
         return;
     }
 
@@ -344,6 +345,7 @@ public class FixedSleepCR extends Collec
     
     public Progress[] getProgress() 
     {
+       int index = indexProvider.get();
         logger.log(Level.INFO, "getProgress");
         ProgressImpl[] retVal = new ProgressImpl[1];
         retVal[0] = new ProgressImpl(index,workitems.size(),"WorkItems");
@@ -354,6 +356,7 @@ public class FixedSleepCR extends Collec
     public boolean hasNext() throws IOException, CollectionException 
     {
         logger.log(Level.INFO, "hasNext");
+        int index = indexProvider.get();
         boolean answer = (index < workitems.size());
         if ( ! answer ) {
             logger.log(Level.INFO, "" + System.currentTimeMillis() + " " + 
jobid + " No more work, hasNext returns " + answer);

Modified: 
uima/uima-ducc/trunk/uima-ducc-examples/src/main/java/org/apache/uima/ducc/test/service/AnonymousService.java
URL: 
http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-examples/src/main/java/org/apache/uima/ducc/test/service/AnonymousService.java?rev=1750807&r1=1750806&r2=1750807&view=diff
==============================================================================
--- 
uima/uima-ducc/trunk/uima-ducc-examples/src/main/java/org/apache/uima/ducc/test/service/AnonymousService.java
 (original)
+++ 
uima/uima-ducc/trunk/uima-ducc-examples/src/main/java/org/apache/uima/ducc/test/service/AnonymousService.java
 Thu Jun 30 14:42:26 2016
@@ -138,7 +138,9 @@ public class AnonymousService
                 return;
                        } finally {
                 try {
-                                       server.close();
+                       if(server != null) {
+                               server.close();
+                       }
                                } catch (IOException e) {
                                        e.printStackTrace();
                                }