svn commit: r646495 - in /commons/sandbox/functor/trunk/src: main/java/org/apache/commons/functor/generator/IteratorToGeneratorAdapter.java test/java/org/apache/commons/functor/generator/TestIteratorToGeneratorAdapter.java

[mbenson]

Author: mbenson
Date: Wed Apr  9 12:32:23 2008
New Revision: 646495

URL: http://svn.apache.org/viewvc?rev=646495&view=rev
Log:
IllegalArgumentException more to-the-point than NPE

Modified:
    
commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/generator/IteratorToGeneratorAdapter.java
    
commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/generator/TestIteratorToGeneratorAdapter.java

Modified: 
commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/generator/IteratorToGeneratorAdapter.java
URL: 
http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/generator/IteratorToGeneratorAdapter.java?rev=646495&r1=646494&r2=646495&view=diff
==============================================================================
--- 
commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/generator/IteratorToGeneratorAdapter.java
 (original)
+++ 
commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/generator/IteratorToGeneratorAdapter.java
 Wed Apr  9 12:32:23 2008
@@ -40,10 +40,9 @@
      */
     public IteratorToGeneratorAdapter(Iterator iter) {
         if (null == iter) {
-            throw new NullPointerException();
-        } else {
-            this.iter = iter;
+            throw new IllegalArgumentException("Iterator argument was null");
         }
+        this.iter = iter;
     }
 
     // instance methods

Modified: 
commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/generator/TestIteratorToGeneratorAdapter.java
URL: 
http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/generator/TestIteratorToGeneratorAdapter.java?rev=646495&r1=646494&r2=646495&view=diff
==============================================================================
--- 
commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/generator/TestIteratorToGeneratorAdapter.java
 (original)
+++ 
commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/generator/TestIteratorToGeneratorAdapter.java
 Wed Apr  9 12:32:23 2008
@@ -90,7 +90,7 @@
         try {
             new IteratorToGeneratorAdapter(null);
             fail("Expected NullPointerException");
-        } catch(NullPointerException e) {
+        } catch(IllegalArgumentException e) {
             // expected
         }
     }