Skip to content
This repository has been archived by the owner on Oct 4, 2021. It is now read-only.

Commit

Permalink
make sure remotes always use their internal session manager
Browse files Browse the repository at this point in the history
  • Loading branch information
DivineThreepwood committed Jan 13, 2020
1 parent f74394b commit 3cb40ed
Showing 1 changed file with 3 additions and 3 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -585,7 +585,7 @@ public Future<ActionDescription> applyAction(ActionDescription actionDescription
logger.warn("New action offers an id which will be overwritten by controller!");
}

return AuthenticatedServiceProcessor.requestAuthenticatedAction(actionDescription, ActionDescription.class, this.getSessionManager(), authenticatedValue -> applyActionAuthenticated(authenticatedValue));
return AuthenticatedServiceProcessor.requestAuthenticatedAction(actionDescription, ActionDescription.class, getSessionManager(), authenticatedValue -> applyActionAuthenticated(authenticatedValue));
}

@Override
Expand All @@ -596,9 +596,9 @@ public Future<ActionDescription> applyAction(final ActionDescription actionDescr
actionDescripBuilder.getServiceStateDescriptionBuilder().setUnitId(getId());
}
if (SessionManager.getInstance().isLoggedIn() && (authToken != null)) {
final AuthenticatedValue authenticatedValue = SessionManager.getInstance().initializeRequest(actionDescripBuilder.build(), authToken);
final AuthenticatedValue authenticatedValue = getSessionManager().initializeRequest(actionDescripBuilder.build(), authToken);
final Future<AuthenticatedValue> future = applyActionAuthenticated(authenticatedValue);
return new AuthenticatedValueFuture<>(future, ActionDescription.class, authenticatedValue.getTicketAuthenticatorWrapper(), SessionManager.getInstance());
return new AuthenticatedValueFuture<>(future, ActionDescription.class, authenticatedValue.getTicketAuthenticatorWrapper(), getSessionManager());
} else {
return applyAction(actionDescripBuilder.build());
}
Expand Down

0 comments on commit 3cb40ed

Please sign in to comment.