Fixed a possible NPE due to auto boxing.

jawi · Oct 23, 2010 · 3e81d9e · 3e81d9e
1 parent b7dac52
commit 3e81d9e
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/tool.measure/src/main/java/nl/lxtreme/ols/tool/measure/ClockFrequencyMeasureWorker.java b/tool.measure/src/main/java/nl/lxtreme/ols/tool/measure/ClockFrequencyMeasureWorker.java
@@ -148,6 +148,10 @@ protected ClockStats doInBackground() throws Exception
     int start = context.getStartSampleIndex();
     int end = context.getEndSampleIndex();
 
+    // Make sure no other stuff from previous runs keep lingering...
+    this.stats.get( Edge.RISING ).clear();
+    this.stats.get( Edge.FALLING ).clear();
+
     int i = Math.max( 0, start - 1 );
     long lastTransition = 0;
     int lastBitValue = values[i] & this.channelMask;
@@ -179,9 +183,10 @@ protected ClockStats doInBackground() throws Exception
       lastBitValue = bitValue;
     }
 
-    final int bestRising = this.stats.get( Edge.RISING ).getHighestRanked();
-    final int bestFalling = this.stats.get( Edge.FALLING ).getHighestRanked();
+    final Integer bestRising = this.stats.get( Edge.RISING ).getHighestRanked();
+    final Integer bestFalling = this.stats.get( Edge.FALLING ).getHighestRanked();
 
-    return new ClockStats( bestRising, bestFalling, getSampleRate() );
+    return new ClockStats( ( bestRising == null ) ? 0 : bestRising.intValue(), //
+        ( bestFalling == null ) ? 0 : bestFalling.intValue(), getSampleRate() );
   }
 }