diff options
| author | Matthew Newhook <matthew@zeroc.com> | 2005-10-26 03:39:11 +0000 |
|---|---|---|
| committer | Matthew Newhook <matthew@zeroc.com> | 2005-10-26 03:39:11 +0000 |
| commit | 86cbabd48e182962285634e3ad92e29d08dd85ca (patch) | |
| tree | 81da20e4c7d23f25a53ee3535f3f5cc59cda540f /java/src/IceInternal/ConnectionMonitor.java | |
| parent | catch java.lang.Throwable, not java.lang.Exception when starting an icebox (diff) | |
| download | ice-86cbabd48e182962285634e3ad92e29d08dd85ca.tar.bz2 ice-86cbabd48e182962285634e3ad92e29d08dd85ca.tar.xz ice-86cbabd48e182962285634e3ad92e29d08dd85ca.zip | |
sync ConnectionMonitor with C++
Diffstat (limited to 'java/src/IceInternal/ConnectionMonitor.java')
| -rw-r--r-- | java/src/IceInternal/ConnectionMonitor.java | 29 |
1 files changed, 18 insertions, 11 deletions
diff --git a/java/src/IceInternal/ConnectionMonitor.java b/java/src/IceInternal/ConnectionMonitor.java index 3f1c6307944..2608adcad97 100644 --- a/java/src/IceInternal/ConnectionMonitor.java +++ b/java/src/IceInternal/ConnectionMonitor.java @@ -94,18 +94,16 @@ public final class ConnectionMonitor extends Thread { synchronized(this) { - if(_instance == null) - { - return; - } - - try - { - wait(_interval * 1000); - } - catch(InterruptedException ex) + if(_instance != null) { - continue; + try + { + wait(_interval * 1000); + } + catch(InterruptedException ex) + { + continue; + } } if(_instance == null) @@ -135,6 +133,11 @@ public final class ConnectionMonitor extends Thread { synchronized(this) { + if(_instance == null) + { + return; + } + java.io.StringWriter sw = new java.io.StringWriter(); java.io.PrintWriter pw = new java.io.PrintWriter(sw); ex.printStackTrace(pw); @@ -148,6 +151,10 @@ public final class ConnectionMonitor extends Thread { synchronized(this) { + if(_instance == null) + { + return; + } java.io.StringWriter sw = new java.io.StringWriter(); java.io.PrintWriter pw = new java.io.PrintWriter(sw); ex.printStackTrace(pw); |