diff options
| author | Jose <jose@zeroc.com> | 2019-06-20 09:33:00 +0200 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2019-06-20 09:33:00 +0200 |
| commit | dba243d6da23ec6d2ba5a32667a2be90ddda89ac (patch) | |
| tree | 2dc49f2fe2404eabf55543a70d049343d764b46d | |
| parent | Switch to ice_fixed to create fixed proxies (diff) | |
| parent | Fixed warnings reported by Xcode code analyzer (diff) | |
| download | ice-dba243d6da23ec6d2ba5a32667a2be90ddda89ac.tar.bz2 ice-dba243d6da23ec6d2ba5a32667a2be90ddda89ac.tar.xz ice-dba243d6da23ec6d2ba5a32667a2be90ddda89ac.zip | |
Merge remote-tracking branch 'origin/3.7' into swift
| -rw-r--r-- | cpp/src/IceIAP/Transceiver.mm | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/cpp/src/IceIAP/Transceiver.mm b/cpp/src/IceIAP/Transceiver.mm index fb3bc30107b..3f2a0d3f4ae 100644 --- a/cpp/src/IceIAP/Transceiver.mm +++ b/cpp/src/IceIAP/Transceiver.mm @@ -31,7 +31,8 @@ using namespace IceInternal; @implementation iAPTransceiverCallback -(id) init:(SelectorReadyCallback*)cb { - if(![super init]) + self = [super init]; + if(!self) { return nil; } @@ -417,7 +418,6 @@ IceObjC::iAPTransceiver::checkErrorStatus(NSStream* stream, const char* file, in if([domain compare:NSPOSIXErrorDomain] == NSOrderedSame) { errno = static_cast<int>([err code]); - [err release]; if(interrupted() || noBuffers()) { return; @@ -446,6 +446,5 @@ IceObjC::iAPTransceiver::checkErrorStatus(NSStream* stream, const char* file, in CFNetworkException ex(file, line); ex.domain = [domain UTF8String]; ex.error = static_cast<int>([err code]); - [err release]; throw ex; } |