You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@velocity.apache.org by cb...@apache.org on 2010/10/01 13:24:37 UTC

svn commit: r1003486 - in /velocity/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/config: ConfigurationException.java ToolConfiguration.java

Author: cbrisson
Date: Fri Oct  1 11:24:36 2010
New Revision: 1003486

URL: http://svn.apache.org/viewvc?rev=1003486&view=rev
Log:
always transmit original error when throwing a ConfigurationException

Modified:
    velocity/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/config/ConfigurationException.java
    velocity/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/config/ToolConfiguration.java

Modified: velocity/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/config/ConfigurationException.java
URL: http://svn.apache.org/viewvc/velocity/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/config/ConfigurationException.java?rev=1003486&r1=1003485&r2=1003486&view=diff
==============================================================================
--- velocity/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/config/ConfigurationException.java (original)
+++ velocity/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/config/ConfigurationException.java Fri Oct  1 11:24:36 2010
@@ -41,6 +41,12 @@ public class ConfigurationException exte
         this.source = data;
     }
 
+    public ConfigurationException(Data data, String message, Throwable cause)
+    {
+        super(message, cause);
+        this.source = data;
+    }
+
     public ConfigurationException(Configuration config, Throwable cause)
     {
         super(cause);
@@ -53,6 +59,12 @@ public class ConfigurationException exte
         this.source = config;
     }
 
+    public ConfigurationException(Configuration config, String message, Throwable cause)
+    {
+        super(message, cause);
+        this.source = config;
+    }
+
     public Object getSource()
     {
         return source;

Modified: velocity/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/config/ToolConfiguration.java
URL: http://svn.apache.org/viewvc/velocity/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/config/ToolConfiguration.java?rev=1003486&r1=1003485&r2=1003486&view=diff
==============================================================================
--- velocity/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/config/ToolConfiguration.java (original)
+++ velocity/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/config/ToolConfiguration.java Fri Oct  1 11:24:36 2010
@@ -280,7 +280,9 @@ public class ToolConfiguration extends C
                 info = new OldToolInfo(getKey(), getToolClass());
                 break;
             default:
-                throw new ConfigurationException(this, getError(status));
+                throw problem == null ?
+                    new ConfigurationException(this, getError(status)) : 
+                    new ConfigurationException(this, getError(status), problem);
         }
 
         info.restrictTo(getRestrictTo());