Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Stepper2010-10-19 10:03:42 +0000
committerEike Stepper2010-10-19 10:03:42 +0000
commitcd3cf8d6d462c75aedc127c7dc24c0f05be3fe7d (patch)
tree2bb5a24b79ce3dffe38c85874418580fb8cf764c /plugins/org.eclipse.net4j.buddies/src/org
parent229a1603ee62c04266c90e50909a04e464fb5bf8 (diff)
downloadcdo-cd3cf8d6d462c75aedc127c7dc24c0f05be3fe7d.tar.gz
cdo-cd3cf8d6d462c75aedc127c7dc24c0f05be3fe7d.tar.xz
cdo-cd3cf8d6d462c75aedc127c7dc24c0f05be3fe7d.zip
[327405] Provide an offline CDOWorkspace with Checkout/Update/Commit workflows
https://bugs.eclipse.org/bugs/show_bug.cgi?id=327405
Diffstat (limited to 'plugins/org.eclipse.net4j.buddies/src/org')
-rw-r--r--plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/SessionManager.java30
1 files changed, 11 insertions, 19 deletions
diff --git a/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/SessionManager.java b/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/SessionManager.java
index 67bb2e880f..af69c6021d 100644
--- a/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/SessionManager.java
+++ b/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/SessionManager.java
@@ -119,28 +119,20 @@ public class SessionManager extends Lifecycle implements ISessionManager, IListe
throw new IllegalStateException("connector == null"); //$NON-NLS-1$
}
- boolean connected = connector.waitForConnection(5000L);
- if (connected)
+ session = BuddiesUtil.openSession(connector, getUserID(), getPassword(), 5000L);
+ if (session != null)
{
- session = BuddiesUtil.openSession(connector, getUserID(), getPassword(), 5000L);
- if (session != null)
+ if (connecting)
{
- if (connecting)
- {
- session.addListener(SessionManager.this);
- setState(ISessionManager.State.CONNECTED);
- }
- else
- {
- session.close();
- session = null;
- setState(ISessionManager.State.DISCONNECTED);
- }
+ session.addListener(SessionManager.this);
+ setState(ISessionManager.State.CONNECTED);
+ }
+ else
+ {
+ session.close();
+ session = null;
+ setState(ISessionManager.State.DISCONNECTED);
}
- }
- else
- {
- connector.close();
}
}
}

Back to the top