diff options
author | Roberto Sanchez | 2015-04-15 14:39:02 +0000 |
---|---|---|
committer | Roberto Sanchez | 2015-04-15 14:39:02 +0000 |
commit | b11ca274d91c9a4bd23ffb528ed0005b10090058 (patch) | |
tree | 60adb349f0b2fc85e572ca291ed73edbcc3142f1 | |
parent | a1697225fcc3111bbb216eda8f288fa9703a587c (diff) | |
download | webtools.javaee-b11ca274d91c9a4bd23ffb528ed0005b10090058.tar.gz webtools.javaee-b11ca274d91c9a4bd23ffb528ed0005b10090058.tar.xz webtools.javaee-b11ca274d91c9a4bd23ffb528ed0005b10090058.zip |
Revert "[459564] JUNIT failed to run during the WTP build (code for diagnostic)"
This reverts commit b4636c9df9d177bc5af7623a822407861ff2dbec.
-rw-r--r-- | plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/JavaEEEMFArchiveAdapterHelper.java | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/JavaEEEMFArchiveAdapterHelper.java b/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/JavaEEEMFArchiveAdapterHelper.java index 2f664b010..c7149cefc 100644 --- a/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/JavaEEEMFArchiveAdapterHelper.java +++ b/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/JavaEEEMFArchiveAdapterHelper.java @@ -30,7 +30,6 @@ import org.eclipse.emf.ecore.resource.ContentHandler; import org.eclipse.emf.ecore.resource.Resource; import org.eclipse.emf.ecore.resource.ResourceSet; import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl; -import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin; import org.eclipse.jst.jee.archive.ArchiveModelLoadException; import org.eclipse.jst.jee.archive.IArchive; import org.eclipse.jst.jee.archive.IArchiveResource; @@ -119,17 +118,7 @@ public class JavaEEEMFArchiveAdapterHelper { public Resource getResource(IPath resourcePath) throws ArchiveModelLoadException { URI uri = getArchiveURIConverter().getURI(resourcePath); - - Resource resource = null; - - try { - resource = getResourceSet().getResource(uri, true); - } - catch (org.eclipse.emf.common.util.WrappedException e){ - J2EEPlugin.logError("Error getting resource using " //$NON-NLS-1$ - + "org.eclipse.emf.ecore.resource.ResourceSet.getResource(URI uri, boolean loadOnDemand). The URI is: " + uri, e); //$NON-NLS-1$ - throw e; - } + Resource resource = getResourceSet().getResource(uri, true); return resource; } |