fix #774 infinite loop in net.sourceforge.phpeclipse.builder.IdentifierIndexManager...

[phpeclipse.git] / net.sourceforge.phpeclipse / src / net / sourceforge / phpdt / internal / core / JavaModelManager.java

diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/JavaModelManager.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/JavaModelManager.java
index b64d468..721acdc 100644 (file)
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/JavaModelManager.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/JavaModelManager.java
@@ -1549,7 +1549,7 @@ public class JavaModelManager implements ISaveParticipant {
                                } else { // internal resource (not an IFile or not existing)
                                        IPath location;
                                        if (file.getType() != IResource.FILE
-                                                       || (location = file.getLocation()) == null) {
+                                                       || (location = file.getFullPath()) == null) {
                                                throw new CoreException(
                                                                new Status(
                                                                                IStatus.ERROR,
@@ -1568,7 +1568,7 @@ public class JavaModelManager implements ISaveParticipant {
                                                        JavaCore.PLUGIN_ID, -1, Util.bind(
                                                                        "file.notFound", path.toString()), null)); //$NON-NLS-1$
                                }
-                               IPath location = file.getLocation();
+                               IPath location = file.getFullPath();
                                if (location == null) {
                                        throw new CoreException(new Status(IStatus.ERROR,
                                                        JavaCore.PLUGIN_ID, -1, Util.bind(
@@ -2108,7 +2108,7 @@ public class JavaModelManager implements ISaveParticipant {
        }
 
        private synchronized Map containerClone(IJavaProject project) {
-               Map originalProjectContainers = (Map) this.containers.get(project);
+               Map originalProjectContainers = (Map) JavaModelManager.containers.get(project);
                if (originalProjectContainers == null)
                        return null;
                Map projectContainers = new HashMap(originalProjectContainers.size());