Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Valenta2004-03-23 19:18:52 +0000
committerMichael Valenta2004-03-23 19:18:52 +0000
commit227644d521b4d344a56d3b7fc52f384173dabb8c (patch)
treef3316ae9db2f31327c7834dd589c34eacdf2018d
parent052c4e77921a37aaebbf02812148805f06fd13c5 (diff)
downloadeclipse.platform.team-227644d521b4d344a56d3b7fc52f384173dabb8c.tar.gz
eclipse.platform.team-227644d521b4d344a56d3b7fc52f384173dabb8c.tar.xz
eclipse.platform.team-227644d521b4d344a56d3b7fc52f384173dabb8c.zip
Fixes to resource import
-rw-r--r--bundles/org.eclipse.team.core/src/org/eclipse/team/core/variants/ThreeWaySynchronizer.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/variants/ThreeWaySynchronizer.java b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/variants/ThreeWaySynchronizer.java
index 7574ad436..55b5c0691 100644
--- a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/variants/ThreeWaySynchronizer.java
+++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/variants/ThreeWaySynchronizer.java
@@ -327,7 +327,9 @@ public class ThreeWaySynchronizer implements IFlushOperation {
try {
Set potentialChildren = new HashSet();
IContainer container = (IContainer)resource;
- potentialChildren.addAll(Arrays.asList(container.members()));
+ if (container.exists()) {
+ potentialChildren.addAll(Arrays.asList(container.members()));
+ }
potentialChildren.addAll(Arrays.asList(cache.members(resource)));
List result = new ArrayList();
for (Iterator iter = potentialChildren.iterator(); iter.hasNext();) {

Back to the top