Remove one unnecessary method, rename another

2 files changed, 3 insertions, 7 deletions

diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionRepository.java b/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionRepository.java
index bf596ddf985..64011726733 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionRepository.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionRepository.java
@@ -379,7 +379,7 @@ public class SessionRepository {
         return deleted;
     }
 
-    public void deactivateAndUpdateCache(long sessionId) {
+    public void deactivateSession(long sessionId) {
         var s = remoteSessionCache.get(sessionId);
         if (s == null) return;
 
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionStateWatcher.java b/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionStateWatcher.java
index efe1ecd0e7f..082743e48f9 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionStateWatcher.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionStateWatcher.java
@@ -50,7 +50,7 @@ public class SessionStateWatcher {
                 break;
             case DELETE:
             case DEACTIVATE:
-                sessionRepository.deactivateAndUpdateCache(sessionId);
+                sessionRepository.deactivateSession(sessionId);
                 break;
             case PREPARE:
                 sessionRepository.prepareRemoteSession(sessionId);
@@ -63,10 +63,6 @@ public class SessionStateWatcher {
         }
     }
 
-    public long getSessionId() {
-        return sessionId;
-    }
-
     public void close() {
         try {
             fileCache.close();
@@ -85,7 +81,7 @@ public class SessionStateWatcher {
                     sessionStatusChanged(newStatus);
                 }
             } catch (Exception e) {
-                log.log(Level.WARNING, "Error handling session change to " + newStatus.name() + " for session " + getSessionId(), e);
+                log.log(Level.WARNING, "Error handling session change to " + newStatus.name() + " for session " + sessionId, e);
                 metrics.incSessionChangeErrors();
             }
         });