Changeset 4054

Timestamp:

Dec 11, 2007, 11:51:57 AM (16 years ago)

Author:

Martin Svensson

Message:

Fixes #865 Progress reporter implementation should detect and handle negative values due to integer wrap around.

File:

• branches/2.5-stable/src/core/net/sf/basedb/core/Job.java (modified) (3 diffs)

branches/2.5-stable/src/core/net/sf/basedb/core/Job.java

@@ -1210 +1210 @@
     private long lastUpdate;
     
+    private int lastValue;
+    private int offset;
+    
     ProgressReporterImpl(Job job, String server, ProgressReporter chained)
       throws BaseException
@@ -1219 +1222 @@
       this.chained = chained;
       this.lastUpdate = 0;
+      this.lastValue = 0;
+      this.offset = 0;
     }
     
@@ -1230 +1235 @@
       if (System.currentTimeMillis() - lastUpdate > UPDATE_INTERVAL)
       {
+        // If the percent is negative and less then the last value, an offset will be calculated.
+        // This will adjust the percent to a realistic value. 
+        //Notice: It is only possible to give a value close to what expected. 
+        if (percent < lastValue && percent < 0)
+        { 
+          if (Math.abs(percent) < Math.abs(lastValue))
+          {
+            offset = offset + 2*Math.abs(lastValue);
+          }
+          else
+          { 
+            offset = offset + 2*Math.abs(percent);
+          }
+        }
+        lastValue = percent;    
+        percent = percent + offset;
+        
         lastUpdate = System.currentTimeMillis();
         DbControl dc = null;