Skip to content

Avoid side-effects when querying session type. #31

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
kriben wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Avoid side-effects when querying session type. #31

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 7 additions & 11 deletions src/main/java/org/caffa/rpc/RestClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -242,6 +242,7 @@ public RestClient(String host, int port) throws Exception {

public void connect(String username, String password) throws Exception {
try {
disconnecting.set(false);
this.httpClient = createHttpClient(username, password);
this.sessionUuid = this.createSession(initialSessionType).getUuid();
startKeepAliveTransfer();
Expand All @@ -267,20 +268,15 @@ public CaffaSession.Type getInitialSessionType() {
}

public CaffaSession.Type getCurrentSessionType() {
CaffaSession.Type type = CaffaSession.Type.INVALID;

lock();
try {
type = getSession().getType();
lock();
return getSession().getType();
} catch (CaffaConnectionError e) {
logger.error("Failed to retrieve session " + this.sessionUuid);
this.sessionUuid = "";
this.disconnecting.set(true);
logger.error("Failed to retrieve session: " + this.sessionUuid);
return CaffaSession.Type.INVALID;
} finally {
unlock();
}

unlock();

return type;
}

private CaffaSession createSession(CaffaSession.Type type) throws CaffaConnectionError {
Expand Down