ProjectURI resolver now passes in an absolute filepath.
Fixed code to handle either absolute or relative.
diff --git a/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/java/XMLJSPRegionHelper.java b/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/java/XMLJSPRegionHelper.java
index 0e4608b..e7d6a71 100644
--- a/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/java/XMLJSPRegionHelper.java
+++ b/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/java/XMLJSPRegionHelper.java
@@ -17,6 +17,7 @@
import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.Path;
import org.eclipse.jst.jsp.core.internal.Logger;
import org.eclipse.jst.jsp.core.internal.parser.JSPSourceParser;
@@ -387,9 +388,11 @@
int count = 0;
InputStream is = null;
try {
- // filename is now going to be project relative beacuse of
- // our use of FileBuffers
- IFile f = ResourcesPlugin.getWorkspace().getRoot().getFile(new Path(fileName));
+ IPath filePath = new Path(fileName);
+ IFile f = ResourcesPlugin.getWorkspace().getRoot().getFile(filePath);
+ if(!f.exists()) {
+ f = ResourcesPlugin.getWorkspace().getRoot().getFileForLocation(filePath);
+ }
is = f.getContents();
while ((c = is.read()) != -1) {
count++;
