diff options
author | Harald Musum <musum@yahooinc.com> | 2022-07-12 15:53:01 +0200 |
---|---|---|
committer | Harald Musum <musum@yahooinc.com> | 2022-07-12 15:53:01 +0200 |
commit | 1e3f96034d625fa542aa5984becc954a2550dadd (patch) | |
tree | bcef10200577f006c883309f3db3c889a4282a74 /configserver | |
parent | 8e789b4257cb9d078f25996e0886c71cf4b4f5e7 (diff) |
Remove one unnecessary method, rename another
Diffstat (limited to 'configserver')
-rw-r--r-- | configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionRepository.java | 2 | ||||
-rw-r--r-- | configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionStateWatcher.java | 8 |
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(); } }); |