Finally fixed #336 - thanks JCF

enioka-Haute-Couture · Nov 21, 2018 · 374efa7 · 374efa7
1 parent 1955d16
commit 374efa7
Showing 1 changed file with 5 additions and 26 deletions.
diff --git a/jqm-all/jqm-engine/src/main/java/com/enioka/jqm/tools/DiscreteResourceManager.java b/jqm-all/jqm-engine/src/main/java/com/enioka/jqm/tools/DiscreteResourceManager.java
@@ -40,7 +40,7 @@ class DiscreteResourceManager extends ResourceManagerBase
     private class Token
     {
         private AtomicBoolean free = new AtomicBoolean(true);
-        private Integer jiId = null;
+        private int jiId = 0;
     }
 
     private int defaultConsumption;
@@ -141,7 +141,6 @@ BookingStatus bookResource(JobInstance ji, DbConn cnx)
             {
                 for (Token e : booked.values())
                 {
-                    e.jiId = null;
                     e.free.set(true);
                 }
                 return BookingStatus.FAILED; // If here there are items available, just not enough.
@@ -154,35 +153,15 @@ BookingStatus bookResource(JobInstance ji, DbConn cnx)
     }
 
     @Override
-    synchronized void releaseResource(JobInstance ji)
+    void releaseResource(JobInstance ji)
     {
-        if (ji == null)
-        {
-            throw new JqmInvalidRequestException("JI cannot be null");
-        }
-
         int released = 0;
         for (Token e : this.tokenRepository.values())
         {
-            if (e == null || e.free == null || e.jiId == null)
-            {
-                continue; // Happens when the token has just been created - not an issue.
-            }
-            try
-            {
-                if (!e.free.get() && e.jiId == ji.getId())
-                {
-                    e.jiId = null;
-                    e.free.set(true);
-                    released++;
-                }
-            }
-            catch (NullPointerException e2)
+            if (!e.free.get() && e.jiId == ji.getId())
             {
-                // For bug search.
-                jqmlogger.error("TOKEN : " + e.toString());
-                jqmlogger.error("TOKEN FREE " + e.free);
-                throw new JqmRuntimeException("some NPE where there should be none", e2);
+                e.free.set(true);
+                released++;
             }
         }