Author: lukaszlenart
Date: Thu Apr 18 06:20:37 2013
New Revision: 1469182
URL: http://svn.apache.org/r1469182
Log:
WW-4038 Solves a bug with struts.convention.action.includeJars
Modified:
struts/struts2/trunk/plugins/convention/src/main/java/org/apache/struts2/convention/PackageBasedActionConfigBuilder.java
Modified:
struts/struts2/trunk/plugins/convention/src/main/java/org/apache/struts2/convention/PackageBasedActionConfigBuilder.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/convention/src/main/java/org/apache/struts2/convention/PackageBasedActionConfigBuilder.java?rev=1469182&r1=1469181&r2=1469182&view=diff
==============================================================================
---
struts/struts2/trunk/plugins/convention/src/main/java/org/apache/struts2/convention/PackageBasedActionConfigBuilder.java
(original)
+++
struts/struts2/trunk/plugins/convention/src/main/java/org/apache/struts2/convention/PackageBasedActionConfigBuilder.java
Thu Apr 18 06:20:37 2013
@@ -413,7 +413,7 @@ public class PackageBasedActionConfigBui
private UrlSet buildUrlSet(List<URL> resourceUrls) throws IOException {
ClassLoaderInterface classLoaderInterface = getClassLoaderInterface();
UrlSet urlSet = new UrlSet(resourceUrls);
- urlSet.include(new UrlSet(classLoaderInterface, this.fileProtocols));
+ urlSet = urlSet.include(new UrlSet(classLoaderInterface,
this.fileProtocols));
//excluding the urls found by the parent class loader is desired, but
fails in JBoss (all urls are removed)
if (excludeParentClassLoader) {
