Swiftdiff options
| author | Alex Clayton <alex.clayton@isode.com> | 2016-01-14 11:28:44 (GMT) |
|---|---|---|
| committer | Alex Clayton <alex.clayton@isode.com> | 2016-01-14 13:47:59 (GMT) |
| commit | c72128ba30a386704244322c15146a1b4a609a12 (patch) | |
| tree | ec6ccc82b6e36467736feb20033cc888eceea57a /src/com/isode/stroke/network/TLSConnection.java | |
| parent | b4cf2bb8d7b69d95b4a10d610ad259998d2aee5b (diff) | |
| download | stroke-c72128ba30a386704244322c15146a1b4a609a12.zip stroke-c72128ba30a386704244322c15146a1b4a609a12.tar.bz2 | |
More Changes to Networks
Some more changes to the Networks classes. Based on comments on the last
patch.
Test-information:
No longer see crash I was seeing when I ran the updated Stroke against MLC.
Ran unit tests.
Change-Id: Id577e5322bab0ec48f0353907f82e72bc93b848a
Diffstat (limited to 'src/com/isode/stroke/network/TLSConnection.java')
| -rw-r--r-- | src/com/isode/stroke/network/TLSConnection.java | 20 |
1 files changed, 15 insertions, 5 deletions
diff --git a/src/com/isode/stroke/network/TLSConnection.java b/src/com/isode/stroke/network/TLSConnection.java index 16c6617..a67f20d 100644 --- a/src/com/isode/stroke/network/TLSConnection.java +++ b/src/com/isode/stroke/network/TLSConnection.java @@ -86,10 +86,18 @@ public class TLSConnection extends Connection { protected void finalize() throws Throwable { try { - onConnectFinishedConnection.disconnect(); - onDataReadConnection.disconnect(); - onDataWrittenConnection.disconnect(); - onDisconnectedConnection.disconnect(); + if (onConnectFinished != null) { + onConnectFinishedConnection.disconnect(); + } + if (onDataReadConnection != null) { + onDataReadConnection.disconnect(); + } + if (onDataWrittenConnection != null) { + onDataWrittenConnection.disconnect(); + } + if (onDisconnectedConnection != null) { + onDisconnectedConnection.disconnect(); + } } finally { super.finalize(); @@ -117,7 +125,9 @@ public class TLSConnection extends Connection { } private void handleRawConnectFinished(boolean error) { - onConnectFinishedConnection.disconnect(); + if (onConnectFinished != null) { + onConnectFinishedConnection.disconnect(); + } if (error) { onConnectFinished.emit(true); } |