[JENKINS-31316] fix remaining serverName usage (#31)

jenkinsci · Oct 4, 2016 · a3d11a0 · a3d11a0
1 parent 43d98a9
commit a3d11a0
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/src/main/java/hudson/plugins/accurev/AccurevSCM.java b/src/main/java/hudson/plugins/accurev/AccurevSCM.java
@@ -168,8 +168,12 @@ public void setServerUUID(String uuid) {
         serverUUID = uuid;
     }
 
+    /**
+     * Getter for Accurev server
+     * @return AccurevServer based on serverUUID
+     */
     public AccurevServer getServer() {
-        return ((AccurevSCMDescriptor) getDescriptor()).getServer(serverName);
+        return DESCRIPTOR.getServer(serverUUID);
     }
 
     /**
@@ -405,7 +409,7 @@ public boolean requiresWorkspaceForPolling() {
      * @return See above.
      */
     public Lock getOptionalLock() {
-        final AccurevServer server = DESCRIPTOR.getServer(serverName);
+        final AccurevServer server = getServer();
         final boolean shouldLock = server.isSyncOperations();
         if (shouldLock) {
             return getMandatoryLock();