diff options
author | Harald Musum <musum@yahooinc.com> | 2023-08-28 11:43:34 +0200 |
---|---|---|
committer | Harald Musum <musum@yahooinc.com> | 2023-08-28 11:43:34 +0200 |
commit | fce91af952e5a5e2fe21c319bc259e0dd4ae5640 (patch) | |
tree | 2c1a8d2f748f0b0e5aea180cd51f3ec067e141f6 /configserver/src/main/java/com | |
parent | 760be64582a095c58893af3f067af8572254579b (diff) |
Rename methods
Diffstat (limited to 'configserver/src/main/java/com')
3 files changed, 7 insertions, 7 deletions
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/application/ApplicationCuratorDatabase.java b/configserver/src/main/java/com/yahoo/vespa/config/server/application/ApplicationCuratorDatabase.java index 42ccf4c436b..bd2bad4db93 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/application/ApplicationCuratorDatabase.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/application/ApplicationCuratorDatabase.java @@ -87,10 +87,10 @@ public class ApplicationCuratorDatabase { * Returns a transaction which writes the given session id as the currently active for the given application. * * @param applicationId An {@link ApplicationId} that represents an active application. - * @param sessionId Id of the session containing the application package for this id. + * @param sessionId session id belonging to the application package for this application id. */ - public Transaction createPutTransaction(ApplicationId applicationId, long sessionId) { - return new CuratorTransaction(curator).add(CuratorOperations.setData(applicationPath(applicationId).getAbsolute(), Utf8.toAsciiBytes(sessionId))); + public Transaction createWriteActiveTransaction(Transaction transaction, ApplicationId applicationId, long sessionId) { + return transaction.add(CuratorOperations.setData(applicationPath(applicationId).getAbsolute(), Utf8.toAsciiBytes(sessionId))); } /** diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/application/TenantApplications.java b/configserver/src/main/java/com/yahoo/vespa/config/server/application/TenantApplications.java index db4a94c6e1a..af29f6e8530 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/application/TenantApplications.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/application/TenantApplications.java @@ -131,10 +131,10 @@ public class TenantApplications implements RequestHandler, HostValidator { * Returns a transaction which writes the given session id as the currently active for the given application. * * @param applicationId An {@link ApplicationId} that represents an active application. - * @param sessionId Id of the session containing the application package for this id. + * @param sessionId session id belonging to the application package for this application id. */ - public Transaction createPutTransaction(ApplicationId applicationId, long sessionId) { - return database().createPutTransaction(applicationId, sessionId); + public Transaction createWriteActiveTransaction(Transaction transaction, ApplicationId applicationId, long sessionId) { + return database().createWriteActiveTransaction(transaction, applicationId, sessionId); } /** 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 64793454517..3144665ec91 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 @@ -974,7 +974,7 @@ public class SessionRepository { public Transaction createActivateTransaction(Session session) { Transaction transaction = createSetStatusTransaction(session, Session.Status.ACTIVATE); - transaction.add(applicationRepo.createPutTransaction(session.getApplicationId(), session.getSessionId()).operations()); + transaction.add(applicationRepo.createWriteActiveTransaction(transaction, session.getApplicationId(), session.getSessionId()).operations()); return transaction; } |