You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by dw...@apache.org on 2010/08/11 22:50:20 UTC
svn commit: r984576 -
/geronimo/server/trunk/plugins/j2ee/geronimo-web-2.5-builder/src/main/java/org/apache/geronimo/web25/deployment/merge/MergeHelper.java
Author: dwoods
Date: Wed Aug 11 20:50:20 2010
New Revision: 984576
URL: http://svn.apache.org/viewvc?rev=984576&view=rev
Log:
workaround to get the BVAL TCK working on the Tocmat assembly again. now, it's back to the previous results of only 1 failure.
Modified:
geronimo/server/trunk/plugins/j2ee/geronimo-web-2.5-builder/src/main/java/org/apache/geronimo/web25/deployment/merge/MergeHelper.java
Modified: geronimo/server/trunk/plugins/j2ee/geronimo-web-2.5-builder/src/main/java/org/apache/geronimo/web25/deployment/merge/MergeHelper.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-web-2.5-builder/src/main/java/org/apache/geronimo/web25/deployment/merge/MergeHelper.java?rev=984576&r1=984575&r2=984576&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-web-2.5-builder/src/main/java/org/apache/geronimo/web25/deployment/merge/MergeHelper.java (original)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-web-2.5-builder/src/main/java/org/apache/geronimo/web25/deployment/merge/MergeHelper.java Wed Aug 11 20:50:20 2010
@@ -561,9 +561,11 @@ public class MergeHelper {
List<String> orderedLibs = new ArrayList<String>();
for (WebFragmentEntry webFragmentEntry : webFragmentEntries) {
String jarURL = webFragmentEntry.getJarURL();
- int iBeginIndex = jarURL.indexOf("WEB-INF/");
- if (iBeginIndex > 0) {
- orderedLibs.add(jarURL.substring(iBeginIndex + 8));
+ if (jarURL != null) {
+ int iBeginIndex = jarURL.indexOf("WEB-INF/");
+ if (iBeginIndex > 0) {
+ orderedLibs.add(jarURL.substring(iBeginIndex + 8));
+ }
}
}
earContext.getGeneralData().put(AbstractWebModuleBuilder.ORDERED_LIBS, orderedLibs);