| commit | fe0bb665c77ff06dc5b37567dcd835d980b4b08d | [log] [tgz] |
|---|---|---|
| author | cbridgha <cbridgha> | Tue Apr 11 19:19:12 2006 +0000 |
| committer | cbridgha <cbridgha> | Tue Apr 11 19:19:12 2006 +0000 |
| tree | c323cf376583609327ec2b82699b8d6b7c4563e0 | |
| parent | 7e0ff954aa0ea8bd5a24a923444843be52e747be [diff] |
[133187] synchronizer fix
diff --git a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/ModuleStructuralModel.java b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/ModuleStructuralModel.java index 9e2c697..132f488 100644 --- a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/ModuleStructuralModel.java +++ b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/ModuleStructuralModel.java
@@ -185,9 +185,10 @@ } finally { res = (XMIResource) getPrimaryResource(); if ((res == null) || (res != null && res.getContents().isEmpty())) { - if (res != null) + if (res != null) { removeResource(res); - return null; + } + res = null; } } }
diff --git a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/resources/VirtualArchiveComponent.java b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/resources/VirtualArchiveComponent.java index 6f8e46a..7f2317a 100644 --- a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/resources/VirtualArchiveComponent.java +++ b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/resources/VirtualArchiveComponent.java
@@ -65,7 +65,7 @@ String archivePathString = archiveLocation.substring(4, archiveLocation.length()); archiveType = archiveLocation.substring(0, archiveLocation.length() - archivePathString.length() -1); - archivePath = new Path(archivePathString); + archivePath = new Path(archivePathString).makeRelative(); } public IVirtualComponent getComponent() {