You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@struts.apache.org by mu...@apache.org on 2008/08/11 16:23:22 UTC
svn commit: r684757 -
/struts/sandbox/trunk/struts2-convention-plugin/src/main/java/org/apache/struts2/convention/DefaultResultMapBuilder.java
Author: musachy
Date: Mon Aug 11 07:23:21 2008
New Revision: 684757
URL: http://svn.apache.org/viewvc?rev=684757&view=rev
Log:
Handle unknown extension in result
Modified:
struts/sandbox/trunk/struts2-convention-plugin/src/main/java/org/apache/struts2/convention/DefaultResultMapBuilder.java
Modified: struts/sandbox/trunk/struts2-convention-plugin/src/main/java/org/apache/struts2/convention/DefaultResultMapBuilder.java
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-convention-plugin/src/main/java/org/apache/struts2/convention/DefaultResultMapBuilder.java?rev=684757&r1=684756&r2=684757&view=diff
==============================================================================
--- struts/sandbox/trunk/struts2-convention-plugin/src/main/java/org/apache/struts2/convention/DefaultResultMapBuilder.java (original)
+++ struts/sandbox/trunk/struts2-convention-plugin/src/main/java/org/apache/struts2/convention/DefaultResultMapBuilder.java Mon Aug 11 07:23:21 2008
@@ -448,7 +448,12 @@
int indexOfDot = location.lastIndexOf(".");
if (indexOfDot > 0) {
String extension = location.substring(indexOfDot + 1);
- return resultsByExtension.get(extension).getName();
+ ResultTypeConfig resultTypeConfig = resultsByExtension.get(extension);
+ if (resultTypeConfig != null) {
+ return resultTypeConfig.getName();
+ } else
+ throw new ConfigurationException("Unable to find a result type for extension [" + extension + "] " +
+ "in location attribute [" + location + "].");
} else {
return packageConfig.getFullDefaultResultType();
}