Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNeil Hauge2013-08-23 16:08:28 +0000
committerNeil Hauge2013-08-23 16:08:28 +0000
commita1185c38d31e3d3a8d5aeb7bf64972fb51dfdf52 (patch)
treeeb200295af6b44bab4a81cff5673f0c1279595ef
parentc667eb851329c8bdb8ee46e9c0de8f15dd342f08 (diff)
downloadwebtools.dali-a1185c38d31e3d3a8d5aeb7bf64972fb51dfdf52.tar.gz
webtools.dali-a1185c38d31e3d3a8d5aeb7bf64972fb51dfdf52.tar.xz
webtools.dali-a1185c38d31e3d3a8d5aeb7bf64972fb51dfdf52.zip
409608 - Remove temp fix for: Intermittent failure on JPA project creation when starting Eclipse.
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/AbstractJpaProject.java10
1 files changed, 1 insertions, 9 deletions
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/AbstractJpaProject.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/AbstractJpaProject.java
index 89386aa169..8802f37d36 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/AbstractJpaProject.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/AbstractJpaProject.java
@@ -30,7 +30,6 @@ import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Platform;
import org.eclipse.core.runtime.Status;
import org.eclipse.core.runtime.content.IContentType;
import org.eclipse.core.runtime.jobs.ISchedulingRule;
@@ -610,14 +609,7 @@ public abstract class AbstractJpaProject
}
protected ProjectResourceLocator getProjectResourceLocator() {
- Object resourceLocator = this.project.getAdapter(ProjectResourceLocator.class);
- //Hack fix to ensure the adatper can be successfully loaded as there are currently problems in the platform
- //in this area. See bugs 405320 and 408506. This fix is essentially a delay mechanism but appears to
- //fully resolve the issue. This temp fix should be removed when bug 408506 is fixed in the platform.
- if (resourceLocator == null) {
- resourceLocator = Platform.getAdapterManager().loadAdapter(this.project, ProjectResourceLocator.class.getName());
- }
- return (ProjectResourceLocator) resourceLocator;
+ return (ProjectResourceLocator) this.project.getAdapter(ProjectResourceLocator.class);
}

Back to the top