svn commit: r519452 - /struts/struts2/branches/STRUTS_2_0_X/plugins/codebehind/src/main/java/org/apache/struts2/codebehind/CodebehindUnknownHandler.java

[mr...@apache.org]

Author: mrdon
Date: Sat Mar 17 14:50:09 2007
New Revision: 519452

URL: http://svn.apache.org/viewvc?view=rev&rev=519452
Log:
Improved error handling for invalid package
WW-1826

Modified:
    struts/struts2/branches/STRUTS_2_0_X/plugins/codebehind/src/main/java/org/apache/struts2/codebehind/CodebehindUnknownHandler.java

Modified: struts/struts2/branches/STRUTS_2_0_X/plugins/codebehind/src/main/java/org/apache/struts2/codebehind/CodebehindUnknownHandler.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_0_X/plugins/codebehind/src/main/java/org/apache/struts2/codebehind/CodebehindUnknownHandler.java?view=diff&rev=519452&r1=519451&r2=519452
==============================================================================
--- struts/struts2/branches/STRUTS_2_0_X/plugins/codebehind/src/main/java/org/apache/struts2/codebehind/CodebehindUnknownHandler.java (original)
+++ struts/struts2/branches/STRUTS_2_0_X/plugins/codebehind/src/main/java/org/apache/struts2/codebehind/CodebehindUnknownHandler.java Sat Mar 17 14:50:09 2007
@@ -41,6 +41,7 @@
 import com.opensymphony.xwork2.UnknownHandler;
 import com.opensymphony.xwork2.XWorkException;
 import com.opensymphony.xwork2.config.Configuration;
+import com.opensymphony.xwork2.config.ConfigurationException;
 import com.opensymphony.xwork2.config.entities.ActionConfig;
 import com.opensymphony.xwork2.config.entities.PackageConfig;
 import com.opensymphony.xwork2.config.entities.ResultConfig;
@@ -70,6 +71,9 @@
         this.defaultPackageName = defaultPackage;
         resultsByExtension = new LinkedHashMap<String,ResultTypeConfig>();
         PackageConfig parentPackage = configuration.getPackageConfig(defaultPackageName);
+        if (parentPackage == null) {
+            throw new ConfigurationException("Unknown parent package: "+parentPackage);
+        }    
         Map<String,ResultTypeConfig> results = parentPackage.getAllResultTypeConfigs();
         
         resultsByExtension.put("jsp", results.get("dispatcher"));