JENKINS-4369 Fix - Workspace relocation check false positivities

#11
jenkinsci · Aug 23, 2016 · c825f7c · c825f7c
1 parent d37f59b
commit c825f7c
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/src/main/java/hudson/plugins/accurev/delegates/ReftreeDelegate.java b/src/main/java/hudson/plugins/accurev/delegates/ReftreeDelegate.java
@@ -220,7 +220,7 @@ protected boolean isRequired(AccurevReferenceTree accurevReftree, RemoteWorkspac
                         String oldStorage = accurevReftree.getStorage()
                         .replace("/", remoteDetails.getFileSeparator())
                         .replace("\\", remoteDetails.getFileSeparator());
-                        return !oldStorage.equals(remoteDetails.getPath());
+                        return !new File(oldStorage).equals(new File(remoteDetails.getPath()));
                     }
 
                     public void appendCommand(ArgumentListBuilder cmd, Relocation relocation) {

diff --git a/src/main/java/hudson/plugins/accurev/delegates/WorkspaceDelegate.java b/src/main/java/hudson/plugins/accurev/delegates/WorkspaceDelegate.java
@@ -14,6 +14,8 @@
 import hudson.plugins.accurev.parsers.xml.ParseShowWorkspaces;
 import hudson.scm.PollingResult;
 import hudson.util.ArgumentListBuilder;
+
+import java.io.File;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
@@ -172,7 +174,7 @@ private enum WorkspaceRelocation implements RelocationOption {
 
                     @Override
                     protected boolean isRequired(AccurevWorkspace accurevWorkspace, RemoteWorkspaceDetails remoteDetails, String localStream) {
-                        return !accurevWorkspace.getHost().equals(remoteDetails.getHostName());
+                        return !accurevWorkspace.getHost().equalsIgnoreCase(remoteDetails.getHostName());
                     }
 
                     public void appendCommand(ArgumentListBuilder cmd, Relocation relocation) {
@@ -188,7 +190,7 @@ protected boolean isRequired(AccurevWorkspace accurevWorkspace, RemoteWorkspaceD
                         String oldStorage = accurevWorkspace.getStorage()
                         .replace("/", remoteDetails.getFileSeparator())
                         .replace("\\", remoteDetails.getFileSeparator());
-                        return !oldStorage.equals(remoteDetails.getPath());
+                        return !new File(oldStorage).equals(new File(remoteDetails.getPath()));
                     }
 
                     public void appendCommand(ArgumentListBuilder cmd, Relocation relocation) {