Author: mrdon Date: Sat Mar 17 14:39:17 2007 New Revision: 519447 URL: http://svn.apache.org/viewvc?view=rev&rev=519447 Log: Better handling of invalid package name WW-1826
Modified: struts/struts2/trunk/plugins/codebehind/src/main/java/org/apache/struts2/codebehind/CodebehindUnknownHandler.java Modified: struts/struts2/trunk/plugins/codebehind/src/main/java/org/apache/struts2/codebehind/CodebehindUnknownHandler.java URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/codebehind/src/main/java/org/apache/struts2/codebehind/CodebehindUnknownHandler.java?view=diff&rev=519447&r1=519446&r2=519447 ============================================================================== --- struts/struts2/trunk/plugins/codebehind/src/main/java/org/apache/struts2/codebehind/CodebehindUnknownHandler.java (original) +++ struts/struts2/trunk/plugins/codebehind/src/main/java/org/apache/struts2/codebehind/CodebehindUnknownHandler.java Sat Mar 17 14:39:17 2007 @@ -70,6 +70,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"));