[194927] issues with faces servlet mapping when running on server
diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/launch/JSFFileURL.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/launch/JSFFileURL.java
index b2df229..bb3192d 100644
--- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/launch/JSFFileURL.java
+++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/launch/JSFFileURL.java
@@ -93,6 +93,7 @@
Iterator mappings = servlet.getMappings().iterator();
ServletMapping map = null;
String foundFileExtension = null;
+ String foundPrefixMapping = null;
while (mappings.hasNext()){
map = (ServletMapping)mappings.next();
@@ -100,14 +101,15 @@
if (foundFileExtension != null && canUseExtensionMapping) {
return existingURL.removeFileExtension().addFileExtension(foundFileExtension);
}
-
- String foundPrefixMapping = JSFUtils11.getPrefixMapping(map);
- if (foundPrefixMapping != null){
- return new Path(foundPrefixMapping).append(existingURL);
+
+ if (foundPrefixMapping == null){
+ foundPrefixMapping = JSFUtils11.getPrefixMapping(map);
}
}
-
+ if (foundPrefixMapping != null)
+ return new Path(foundPrefixMapping).append(existingURL);
+
if (! canUseExtensionMapping && foundFileExtension != null){
//we could prompt user that this may not work...
//for now we will return the extension mapping
