summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Tauber2012-03-19 06:56:10 (EDT)
committer Szymon Ptaszkiewicz2012-03-19 06:56:10 (EDT)
commit64d63102265fe1e9ccb548c2878af1a822653cfc (patch)
treeba3ebad707c0ff94d64caa48430ee292cef5f438
parente6361f702db7d28c75e74fc58d8aba73720affc5 (diff)
downloadeclipse.platform.resources-64d63102265fe1e9ccb548c2878af1a822653cfc.zip
eclipse.platform.resources-64d63102265fe1e9ccb548c2878af1a822653cfc.tar.gz
eclipse.platform.resources-64d63102265fe1e9ccb548c2878af1a822653cfc.tar.bz2
Bug 192631 - AliasManager not correctly comparing EFS filestore uri'sv20120319-1056
-rw-r--r--bundles/org.eclipse.core.resources/src/org/eclipse/core/internal/resources/AliasManager.java16
1 files changed, 15 insertions, 1 deletions
diff --git a/bundles/org.eclipse.core.resources/src/org/eclipse/core/internal/resources/AliasManager.java b/bundles/org.eclipse.core.resources/src/org/eclipse/core/internal/resources/AliasManager.java
index 54d2157..5ddb6a3 100644
--- a/bundles/org.eclipse.core.resources/src/org/eclipse/core/internal/resources/AliasManager.java
+++ b/bundles/org.eclipse.core.resources/src/org/eclipse/core/internal/resources/AliasManager.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2010 IBM Corporation and others.
+ * Copyright (c) 2000, 2012 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -511,6 +511,20 @@ public class AliasManager implements IManager, ILifecycleListener, IResourceChan
return 1;
}
+ // compare hosts
+ compare = compareStringOrNull(uri1.getHost(), uri2.getHost());
+ if (compare != 0)
+ return compare;
+ // compare user infos
+ compare = compareStringOrNull(uri1.getUserInfo(), uri2.getUserInfo());
+ if (compare != 0)
+ return compare;
+ // compare ports
+ int port1 = uri1.getPort();
+ int port2 = uri2.getPort();
+ if (port1 != port2)
+ return port1 - port2;
+
IPath path1 = new Path(uri1.getPath());
IPath path2 = new Path(uri2.getPath());
// compare devices