You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by si...@apache.org on 2011/05/20 14:22:54 UTC

svn commit: r1125346 - in /commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/binder: SetNextBuilder.java SetRootBuilder.java SetTopBuilder.java

Author: simonetripodi
Date: Fri May 20 12:22:53 2011
New Revision: 1125346

URL: http://svn.apache.org/viewvc?rev=1125346&view=rev
Log:
if paramType is null, Rule creation causes NPEs

Modified:
    commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/binder/SetNextBuilder.java
    commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/binder/SetRootBuilder.java
    commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/binder/SetTopBuilder.java

Modified: commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/binder/SetNextBuilder.java
URL: http://svn.apache.org/viewvc/commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/binder/SetNextBuilder.java?rev=1125346&r1=1125345&r2=1125346&view=diff
==============================================================================
--- commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/binder/SetNextBuilder.java (original)
+++ commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/binder/SetNextBuilder.java Fri May 20 12:22:53 2011
@@ -40,7 +40,17 @@ public final class SetNextBuilder
     @Override
     protected SetNextRule createRule()
     {
-        SetNextRule rule = new SetNextRule( getMethodName(), getParamType().getName() );
+        SetNextRule rule;
+
+        if ( getParamType() != null )
+        {
+            rule = new SetNextRule( getMethodName(), getParamType().getName() );
+        }
+        else
+        {
+            rule = new SetNextRule( getMethodName() );
+        }
+
         rule.setExactMatch( isUseExactMatch() );
         return rule;
     }

Modified: commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/binder/SetRootBuilder.java
URL: http://svn.apache.org/viewvc/commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/binder/SetRootBuilder.java?rev=1125346&r1=1125345&r2=1125346&view=diff
==============================================================================
--- commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/binder/SetRootBuilder.java (original)
+++ commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/binder/SetRootBuilder.java Fri May 20 12:22:53 2011
@@ -40,7 +40,17 @@ public final class SetRootBuilder
     @Override
     protected SetRootRule createRule()
     {
-        SetRootRule rule = new SetRootRule( getMethodName(), getParamType().getName() );
+        SetRootRule rule;
+
+        if ( getParamType() != null )
+        {
+            rule = new SetRootRule( getMethodName(), getParamType().getName() );
+        }
+        else
+        {
+            rule = new SetRootRule( getMethodName() );
+        }
+
         rule.setExactMatch( isUseExactMatch() );
         return rule;
     }

Modified: commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/binder/SetTopBuilder.java
URL: http://svn.apache.org/viewvc/commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/binder/SetTopBuilder.java?rev=1125346&r1=1125345&r2=1125346&view=diff
==============================================================================
--- commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/binder/SetTopBuilder.java (original)
+++ commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/binder/SetTopBuilder.java Fri May 20 12:22:53 2011
@@ -40,7 +40,17 @@ public final class SetTopBuilder
     @Override
     protected SetTopRule createRule()
     {
-        SetTopRule rule = new SetTopRule( getMethodName(), getParamType().getName() );
+        SetTopRule rule;
+
+        if ( getParamType() != null )
+        {
+            rule = new SetTopRule( getMethodName(), getParamType().getName() );
+        }
+        else
+        {
+            rule = new SetTopRule( getMethodName() );
+        }
+
         rule.setExactMatch( isUseExactMatch() );
         return rule;
     }