Author: andy
Date: Fri Sep 20 21:17:27 2013
New Revision: 1525149
URL: http://svn.apache.org/r1525149
Log:
Cope with very short time intervals - avoid divide by zero.
Modified:
jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/logging/ProgressLogger.java
Modified:
jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/logging/ProgressLogger.java
URL:
http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/logging/ProgressLogger.java?rev=1525149&r1=1525148&r2=1525149&view=diff
==============================================================================
---
jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/logging/ProgressLogger.java
(original)
+++
jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/logging/ProgressLogger.java
Fri Sep 20 21:17:27 2013
@@ -74,10 +74,15 @@ public class ProgressLogger
long thisTime = timePoint - lastTime ;
// *1000L is milli to second conversion
-
- long batchAvgRate = (counterBatch * 1000L) / thisTime;
- long runAvgRate = (counterTotal * 1000L) / timePoint ;
- print("Add: %,d %s (Batch: %,d / Avg: %,d)", counterTotal, label,
batchAvgRate, runAvgRate) ;
+ if ( thisTime != 0 && timePoint != 0 ) {
+ long batchAvgRate = (counterBatch * 1000L) / thisTime;
+ long runAvgRate = (counterTotal * 1000L) / timePoint ;
+ print("Add: %,d %s (Batch: %,d / Avg: %,d)", counterTotal,
label, batchAvgRate, runAvgRate) ;
+ } else {
+ print("Add: %,d %s (Batch: ---- / Avg: ----)", counterTotal,
label) ;
+ }
+
+
lastTime = timePoint ;
if ( tickPoint(counterTotal, superTick*tickPoint) )
