diff options
author | Håkon Hallingstad <hakon@oath.com> | 2017-09-26 12:26:50 +0200 |
---|---|---|
committer | Håkon Hallingstad <hakon@oath.com> | 2017-09-26 12:26:50 +0200 |
commit | d0fdafff85fee860132f28bafaf38605e4ddc293 (patch) | |
tree | ee558bfc55bade1c76af4e539d8ae5f3e1423d88 /configserver/src | |
parent | 971e4232e6f7440df3aa53a1dce54c8739074473 (diff) | |
parent | 057b7afc924e025c81892707158d2d44d012532e (diff) |
Merge branch 'master' into hakon/move-supermodel-to-config-model-api
Diffstat (limited to 'configserver/src')
-rw-r--r-- | configserver/src/main/java/com/yahoo/vespa/config/server/session/RemoteSessionRepo.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/session/RemoteSessionRepo.java b/configserver/src/main/java/com/yahoo/vespa/config/server/session/RemoteSessionRepo.java index d7c973617c2..659a44bb339 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/session/RemoteSessionRepo.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/session/RemoteSessionRepo.java @@ -139,7 +139,7 @@ public class RemoteSessionRepo extends SessionRepo<RemoteSession> implements Nod return sessions; } - synchronized void sessionsChanged() throws NumberFormatException { + private synchronized void sessionsChanged() throws NumberFormatException { List<Long> sessions = getSessionList(directoryCache.getCurrentData()); checkForRemovedSessions(sessions); checkForAddedSessions(sessions); @@ -236,6 +236,9 @@ public class RemoteSessionRepo extends SessionRepo<RemoteSession> implements Nod case CHILD_REMOVED: sessionsChanged(); break; + case CONNECTION_RECONNECTED: + sessionsChanged(); + break; } } @@ -245,7 +248,6 @@ public class RemoteSessionRepo extends SessionRepo<RemoteSession> implements Nod if (session == null) continue; // session might have been deleted after getting session list log.log(LogLevel.DEBUG, session.logPre() + "Confirming upload for session " + sessionId); session.confirmUpload(); - } } } |