Swiftdiff options
| author | Alan Young <consult.awy@gmail.com> | 2014-11-13 06:42:37 (GMT) |
|---|---|---|
| committer | Alan Young <consult.awy@gmail.com> | 2015-04-10 06:50:58 (GMT) |
| commit | 7d2101b93b6253c3ea15b663f7f3dc385cb21364 (patch) | |
| tree | d81338baf0d117e83cdc07f882cbedd9471e834d /src/com/isode/stroke/network/JavaConnection.java | |
| parent | a20ca7ba40d837abe228462be0aba5d32d6831e3 (diff) | |
| download | stroke-7d2101b93b6253c3ea15b663f7f3dc385cb21364.zip stroke-7d2101b93b6253c3ea15b663f7f3dc385cb21364.tar.bz2 | |
Checkpoint - A bunch of initial stuff for Android
MemoryStorages, Storages
NickManager, NickResolver
CryptoProvider, Hash, SafeByteArray, JavaCryptoProvider
CapsInfoGenerator, CapsManager, CapsMemoryStorage, CapsProvider,
CapsStorage, CapsInfo
CapsInfoSerializer, CapsInfoParser
ClientDiscoManager, DiscoInfoResponder, EntityCapsManager,
EntityCapsProvider
GetDiscoInfoRequest
ChatState, Idle
Presence, PayloadAddingPresenceSender, PresenceOracle,
SubscriptionManager
StatusSerializer, StatusShowSerializer, StatusParser, StatusShowParser,
Replace, ReplaceParser, ReplaceSerializer
SecurityLabel, SecurityLabelsCatalog, GetSecurityLabelsCatalogRequest
VCard, GetVCardRequest, SetVCardRequest, VCardManager,
VCardMemoryStorage, VCardStorage
RosterMemoryStorage, RosterPushResponder, RosterStorage,
SetRosterRequest
XMPPRoster, XMPPRosterController, XMPPRosterImpl, XMPPRosterItem
GetRosterRequest, SetResponder
Add parsers and serializers for Idle, VCard, PrivateStorage & Stroage.
Add
parser for Subject.
Add impromptu flag to MUCInvitation.
Update copyrights.
Change-Id: I9949f506b70e60b3a64f1dadde8f9b235b322e1d
Diffstat (limited to 'src/com/isode/stroke/network/JavaConnection.java')
| -rw-r--r-- | src/com/isode/stroke/network/JavaConnection.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/com/isode/stroke/network/JavaConnection.java b/src/com/isode/stroke/network/JavaConnection.java index f1d72bb..9b171d9 100644 --- a/src/com/isode/stroke/network/JavaConnection.java +++ b/src/com/isode/stroke/network/JavaConnection.java @@ -160,6 +160,7 @@ public class JavaConnection extends Connection implements EventOwner { if(selector_ != null) { try { selector_.close(); + selector_ = null; } catch (IOException e) { } } @@ -382,7 +383,7 @@ public class JavaConnection extends Connection implements EventOwner { private boolean disconnecting_ = false; private boolean disconnected_ = false; private SocketChannel socketChannel_; - private Selector selector_; + private volatile Selector selector_; private SelectionKey selectionKey_; private Worker worker_; |