diff options
| -rwxr-xr-x | cpp/demo/Ice/session/Client.cpp | 23 | ||||
| -rw-r--r-- | java/demo/Ice/session/Client.java | 21 | ||||
| -rw-r--r-- | java/demo/Ice/session/SessionFactoryI.java | 2 |
3 files changed, 21 insertions, 25 deletions
diff --git a/cpp/demo/Ice/session/Client.cpp b/cpp/demo/Ice/session/Client.cpp index 166994d8094..64022d4fbd9 100755 --- a/cpp/demo/Ice/session/Client.cpp +++ b/cpp/demo/Ice/session/Client.cpp @@ -33,19 +33,18 @@ public: while(!_terminated) { timedWait(_timeout); - if(_terminated) + if(!_terminated) { - break; - } - try - { - _session->refresh(); - } - catch(const Ice::Exception& ex) - { - Ice::Warning warn(_logger); - warn << "SessionRefreshThread: " << ex; - break; + try + { + _session->refresh(); + } + catch(const Ice::Exception& ex) + { + Ice::Warning warn(_logger); + warn << "SessionRefreshThread: " << ex; + _terminated = true; + } } } } diff --git a/java/demo/Ice/session/Client.java b/java/demo/Ice/session/Client.java index c9bd29a7a36..2a062181811 100644 --- a/java/demo/Ice/session/Client.java +++ b/java/demo/Ice/session/Client.java @@ -32,18 +32,17 @@ public class Client catch(InterruptedException e) { } - if(_terminated) + if(!_terminated) { - break; - } - try - { - _session.refresh(); - } - catch(Ice.LocalException ex) - { - _logger.warning("SessionRefreshThread: " + ex); - break; + try + { + _session.refresh(); + } + catch(Ice.LocalException ex) + { + _logger.warning("SessionRefreshThread: " + ex); + _terminated = true; + } } } } diff --git a/java/demo/Ice/session/SessionFactoryI.java b/java/demo/Ice/session/SessionFactoryI.java index 5b0a76eb47c..c8b0bf12c69 100644 --- a/java/demo/Ice/session/SessionFactoryI.java +++ b/java/demo/Ice/session/SessionFactoryI.java @@ -33,7 +33,6 @@ class SessionFactoryI extends _SessionFactoryDisp } if(!_terminated) { - assert _factory != null; _factory.reap(); } } @@ -56,7 +55,6 @@ class SessionFactoryI extends _SessionFactoryDisp { _adapter = adapter; _reapThread = new ReapThread(this, _timeout); - _reapThread = new ReapThread(this, _timeout); _reapThread.start(); } |