From 2cebb082f95d84ff6552787aebdc49b5e39c948d Mon Sep 17 00:00:00 2001
From: Lennart Hensler <LennartHensler@aol.com>
Date: Thu, 19 Mar 2015 21:58:22 +0100
Subject: [PATCH] Replaced my custom concurrent counter with an AtomicInteger

---
 ...AbstractPartitioningParallelProcessor.java | 50 +++----------------
 1 file changed, 6 insertions(+), 44 deletions(-)

diff --git a/java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/components/AbstractPartitioningParallelProcessor.java b/java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/components/AbstractPartitioningParallelProcessor.java
index 28aaff94751..1f47ba362c0 100644
--- a/java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/components/AbstractPartitioningParallelProcessor.java
+++ b/java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/components/AbstractPartitioningParallelProcessor.java
@@ -6,8 +6,7 @@ import java.util.Set;
 import java.util.concurrent.Callable;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.RejectedExecutionException;
-import java.util.concurrent.locks.Lock;
-import java.util.concurrent.locks.ReentrantLock;
+import java.util.concurrent.atomic.AtomicInteger;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
@@ -22,7 +21,7 @@ public abstract class AbstractPartitioningParallelProcessor<InputType, WorkingTy
 
     private final Set<Processor<ResultType, ?>> resultReceivers;
     private final ExecutorService executor;
-    private final UnfinishedInstructionsCounter unfinishedInstructionsCounter;
+    private final AtomicInteger unfinishedInstructionsCounter;
     
     private boolean isFinished = false;
     private boolean gotAborted = false;
@@ -31,7 +30,7 @@ public abstract class AbstractPartitioningParallelProcessor<InputType, WorkingTy
         super(inputType, resultType);
         this.executor = executor;
         this.resultReceivers = new HashSet<Processor<ResultType, ?>>(resultReceivers);
-        unfinishedInstructionsCounter = new UnfinishedInstructionsCounter();
+        unfinishedInstructionsCounter = new AtomicInteger();
     }
 
     @Override
@@ -53,11 +52,11 @@ public abstract class AbstractPartitioningParallelProcessor<InputType, WorkingTy
                                     onFailure(e);
                                 }
                             } finally {
-                                AbstractPartitioningParallelProcessor.this.unfinishedInstructionsCounter.decrement();
+                                AbstractPartitioningParallelProcessor.this.unfinishedInstructionsCounter.getAndDecrement();
                             }
                         }
                     };
-                    unfinishedInstructionsCounter.increment();
+                    unfinishedInstructionsCounter.getAndIncrement();
                     try {
                         executor.execute(instructionWrapper);
                     } catch (RejectedExecutionException exc){
@@ -124,7 +123,7 @@ public abstract class AbstractPartitioningParallelProcessor<InputType, WorkingTy
     }
 
     private boolean areUnfinishedInstructionsLeft() {
-        return unfinishedInstructionsCounter.getUnfinishedInstructionsAmount() > 0;
+        return unfinishedInstructionsCounter.get() > 0;
     }
 
     protected void tellResultReceiversToFinish() {
@@ -161,41 +160,4 @@ public abstract class AbstractPartitioningParallelProcessor<InputType, WorkingTy
     
     protected abstract void setAdditionalData(AdditionalResultDataBuilder additionalDataBuilder);
 
-    /**
-     * Thread safe class to manage, if there are unfinished instructions. 
-     */
-    private class UnfinishedInstructionsCounter {
-        
-        private final Lock instructionsAmountLock;
-        private int unfinishedInstructionsAmount;
-        
-        public UnfinishedInstructionsCounter() {
-            instructionsAmountLock = new ReentrantLock();
-        }
-        
-        public void increment() {
-            instructionsAmountLock.lock();
-            try {
-                unfinishedInstructionsAmount++;
-            } finally {
-                instructionsAmountLock.unlock();
-            }
-        }
-        
-        public void decrement() {
-            instructionsAmountLock.lock();
-            try {
-                unfinishedInstructionsAmount--;
-                unfinishedInstructionsAmount = Math.max(0, unfinishedInstructionsAmount);
-            } finally {
-                instructionsAmountLock.unlock();
-            }
-        }
-        
-        public int getUnfinishedInstructionsAmount() {
-            return unfinishedInstructionsAmount;
-        }
-        
-    }
-
 }