Author: bpontarelli
Date: Thu Mar 6 12:58:00 2008
New Revision: 634412
URL: http://svn.apache.org/viewvc?rev=634412&view=rev
Log:
Fixed issue with empty locator and action packages
Modified:
struts/sandbox/trunk/struts2-convention-plugin/src/main/java/org/apache/struts2/convention/PackageBasedActionConfigBuilder.java
Modified:
struts/sandbox/trunk/struts2-convention-plugin/src/main/java/org/apache/struts2/convention/PackageBasedActionConfigBuilder.java
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-convention-plugin/src/main/java/org/apache/struts2/convention/PackageBasedActionConfigBuilder.java?rev=634412&r1=634411&r2=634412&view=diff
==============================================================================
---
struts/sandbox/trunk/struts2-convention-plugin/src/main/java/org/apache/struts2/convention/PackageBasedActionConfigBuilder.java
(original)
+++
struts/sandbox/trunk/struts2-convention-plugin/src/main/java/org/apache/struts2/convention/PackageBasedActionConfigBuilder.java
Thu Mar 6 12:58:00 2008
@@ -107,7 +107,9 @@
*/
@Inject(value = "struts.convention.action.packages", required = false)
public void setActionPackages(String actionPackages) {
- this.actionPackages = actionPackages.split("\\s*[,]\\s*");
+ if (!StringTools.isTrimmedEmpty(actionPackages)) {
+ this.actionPackages = actionPackages.split("\\s*[,]\\s*");
+ }
}
/**
@@ -116,7 +118,9 @@
*/
@Inject(value = "struts.convention.exclude.packages", required = false)
public void setExcludePackages(String excludePackages) {
- this.excludePackages = excludePackages.split("\\s*[,]\\s*");
+ if (!StringTools.isTrimmedEmpty(excludePackages)) {
+ this.excludePackages = excludePackages.split("\\s*[,]\\s*");
+ }
}
/**
