ObjFW/ObjXMPP
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix completely broken exception handling in -[connect].

Browse source
This commit is contained in:
Jonathan Schleifer 2011-05-24 12:27:21 +02:00
parent 95fe343184
commit 35957ae3c3
1 changed files with 8 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/XMPPConnection.m
View file

@ -201,23 +201,22 @@
[XMPPSRVEnumerator enumeratorWithDomain: server]; [XMPPSRVEnumerator enumeratorWithDomain: server];
XMPPSRVEntry *candidate; XMPPSRVEntry *candidate;
while ((candidate = [SRVEnumerator nextObject])) { while ((candidate = [SRVEnumerator nextObject]) != nil) {
@try { @try {
[sock connectToHost: [candidate target] [sock connectToHost: [candidate target]
onPort: [candidate port]]; onPort: [candidate port]];
break; break;
} @catch (id e) { } @catch (OFAddressTranslationFailedException *e) {
if (([e class] == [OFAddressTranslationFailedException [e release];
class]) || ([e class] == } @catch (OFConnectionFailedException *e) {
[OFConnectionFailedException class])) [e release];
continue;
else
@throw e;
} }
} }
if (!candidate) if (!candidate)
[sock connectToHost: server [sock connectToHost: server
onPort: port]; onPort: port];
[self XMPP_startStream]; [self XMPP_startStream];
[pool release]; [pool release];