commons-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From celes...@apache.org
Subject svn commit: r1353140 - /commons/proper/math/trunk/src/main/java/org/apache/commons/math3/util/Incrementor.java
Date Sat, 23 Jun 2012 15:09:15 GMT
Author: celestin
Date: Sat Jun 23 15:09:14 2012
New Revision: 1353140

URL: http://svn.apache.org/viewvc?rev=1353140&view=rev
Log:
In o.a.c.m3.Incrementor, modified constructor to allow for null values of the MaxCountExceededCallback.
Null value was previously not checked wich could lead to a NullPointerException much later
(at exhaustion of the counter).

Modified:
    commons/proper/math/trunk/src/main/java/org/apache/commons/math3/util/Incrementor.java

Modified: commons/proper/math/trunk/src/main/java/org/apache/commons/math3/util/Incrementor.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/main/java/org/apache/commons/math3/util/Incrementor.java?rev=1353140&r1=1353139&r2=1353140&view=diff
==============================================================================
--- commons/proper/math/trunk/src/main/java/org/apache/commons/math3/util/Incrementor.java
(original)
+++ commons/proper/math/trunk/src/main/java/org/apache/commons/math3/util/Incrementor.java
Sat Jun 23 15:09:14 2012
@@ -58,13 +58,7 @@ public class Incrementor {
      * @param max Maximal count.
      */
     public Incrementor(int max) {
-        this(max,
-             new MaxCountExceededCallback() {
-                 /** {@inheritDoc} */
-                 public void trigger(int max) {
-                     throw new MaxCountExceededException(max);
-                 }
-             });
+        this(max, null);
     }
 
     /**
@@ -72,12 +66,22 @@ public class Incrementor {
      * counter exhaustion.
      *
      * @param max Maximal count.
-     * @param cb Function to be called when the maximal count has been reached.
+     * @param cb Function to be called when the maximal count has been reached
+     * (can be {@code null}).
      */
     public Incrementor(int max,
                        MaxCountExceededCallback cb) {
         maximalCount = max;
-        maxCountCallback = cb;
+        if (cb != null) {
+            maxCountCallback = cb;
+        } else {
+            maxCountCallback = new MaxCountExceededCallback() {
+                /** {@inheritDoc} */
+                public void trigger(int max) {
+                    throw new MaxCountExceededException(max);
+                }
+            };
+        }
     }
 
     /**



Mime
View raw message