diff options
| author | Damian Minkov <damencho@jitsi.org> | 2012-04-09 15:29:43 +0000 |
|---|---|---|
| committer | Damian Minkov <damencho@jitsi.org> | 2012-04-09 15:29:43 +0000 |
| commit | bf7d41d620643420559d25bf222f47d203e05cc9 (patch) | |
| tree | 33094c927a854688be6f350fba488eb6fe39d091 /src/net/java/sip/communicator/util | |
| parent | f355167ed08b16228f1be0e1b0e5caf2f9b860e0 (diff) | |
| download | jitsi-bf7d41d620643420559d25bf222f47d203e05cc9.zip jitsi-bf7d41d620643420559d25bf222f47d203e05cc9.tar.gz jitsi-bf7d41d620643420559d25bf222f47d203e05cc9.tar.bz2 | |
Tries to fix a deadlock that can occur on double detecting connection closed, by smack and by our network detection.
Diffstat (limited to 'src/net/java/sip/communicator/util')
| -rw-r--r-- | src/net/java/sip/communicator/util/NetworkUtils.java | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/src/net/java/sip/communicator/util/NetworkUtils.java b/src/net/java/sip/communicator/util/NetworkUtils.java index 7f1aabc..d0d543c 100644 --- a/src/net/java/sip/communicator/util/NetworkUtils.java +++ b/src/net/java/sip/communicator/util/NetworkUtils.java @@ -1416,7 +1416,14 @@ public class NetworkUtils { // reread system dns configuration ResolverConfig.refresh(); - DnsUtilActivator.refreshResolver(); + try + { + DnsUtilActivator.refreshResolver(); + } + catch(Throwable t) + { + logger.error("Error reloading dns util activator"); + } if(parallelResolver instanceof ParallelResolver) { //needs a separate lock object because the parallelResolver could |