svn commit: r1750406 - /uima/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/jd/scheduler/JdScheduler.java

[degenaro]

Author: degenaro
Date: Mon Jun 27 19:28:12 2016
New Revision: 1750406

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

Modified:
    
uima/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/jd/scheduler/JdScheduler.java

Modified: 
uima/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/jd/scheduler/JdScheduler.java
URL: 
http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/jd/scheduler/JdScheduler.java?rev=1750406&r1=1750405&r2=1750406&view=diff
==============================================================================
--- 
uima/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/jd/scheduler/JdScheduler.java
 (original)
+++ 
uima/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/jd/scheduler/JdScheduler.java
 Mon Jun 27 19:28:12 2016
@@ -450,20 +450,16 @@ public class JdScheduler {
                JdReservation jdReservation = null;
                SizeBytes reservationSize = JdHelper.getReservationSize(dwr);
                SizeBytes sliceSize = JdHelper.getSliceSize(jdHostProperties);
-               synchronized(this) {
-                       jdReservation = map.get(jdReservationDuccId);
-                       if(jdReservation == null) {
-                               jdReservation = new JdReservation(dwr, 
reservationSize, sliceSize);
-                               map.put(jdReservationDuccId, jdReservation);
-                       }
-                       else if(!jdReservation.isUp()) {
-                               jdReservation = new JdReservation(dwr, 
reservationSize, sliceSize);
-                               map.put(jdReservationDuccId, jdReservation);
-                       }
-                       else {
-                               jdReservation = null;
-                       }
+               jdReservation = map.get(jdReservationDuccId);
+               if(jdReservation == null) {
+                       jdReservation = new JdReservation(dwr, reservationSize, 
sliceSize);
+                       map.putIfAbsent(jdReservationDuccId, jdReservation);
                }
+               else if(!jdReservation.isUp()) {
+                       jdReservation = new JdReservation(dwr, reservationSize, 
sliceSize);
+                       map.putIfAbsent(jdReservationDuccId, jdReservation);
+               }
+               jdReservation = map.get(jdReservationDuccId);
                if(jdReservation != null) {
                        logger.debug(location, duccId, "host: 
"+jdReservation.getHost());
                }
@@ -499,13 +495,12 @@ public class JdScheduler {
                JdReservation jdReservation = null;
                SizeBytes reservationSize = JdHelper.getReservationSize(dwr);
                SizeBytes sliceSize = JdHelper.getSliceSize(jdHostProperties);
-               synchronized(this) {
-                       jdReservation = map.get(jdReservationDuccId);
-                       if(jdReservation == null) {
-                               jdReservation = new JdReservation(dwr, 
reservationSize, sliceSize);
-                               map.put(jdReservationDuccId, jdReservation);
-                       }
+               jdReservation = map.get(jdReservationDuccId);
+               if(jdReservation == null) {
+                       jdReservation = new JdReservation(dwr, reservationSize, 
sliceSize);
+                       map.putIfAbsent(jdReservationDuccId, jdReservation);
                }
+               jdReservation = map.get(jdReservationDuccId);
                logger.trace(location, duccId, "total: 
"+countReservationsTotal()+" "+"up: "+countReservationsUp());
        }