Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fixed merge issues

This commit is contained in:
Greg Wilkins 2012-04-12 17:16:45 +10:00
parent b5e9de1cd8
commit 325c484950
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/internal/webapp/WebBundleTrackerCustomizer.java
View File

@ -225,7 +225,7 @@ public class WebBundleTrackerCustomizer implements BundleTrackerCustomizer
}
}
private String getWebContextPath(Bundle bundle, Dictionary<?, ?> dic)
private String getWebContextPath(Bundle bundle, Dictionary<?, ?> dic, boolean webinfWebxmlExists)
{
String rfc66ContextPath = (String) dic.get(OSGiWebappConstants.RFC66_WEB_CONTEXTPATH);
if (rfc66ContextPath == null)