merge of '0e0730fe59a4d574138454dc943c443900fe67b6'

and '3c7a201fa0fd3707b904e5173f62765c592e904b'

Monotone-Parent: 0e0730fe59a4d574138454dc943c443900fe67b6
Monotone-Parent: 3c7a201fa0fd3707b904e5173f62765c592e904b
Monotone-Revision: fd3f07ba5f4f69cd1854b37655cacacbbf850787

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2011-12-08T15:03:18
maint-2.0.2
Wolfgang Sourdeau 2011-12-08 15:03:18 +00:00
commit bbd40c49df
3 changed files with 10 additions and 2 deletions

View File

@ -1,3 +1,11 @@
2011-12-08 Wolfgang Sourdeau <wsourdeau@inverse.ca>
* GCSFolder.m (-releaseChannel:): perform the debug logging BEFORE
the channel is released, to avoid a crash.
* GCSFolderManager.m (-releaseChannel:): perform the debug logging BEFORE
the channel is released, to avoid a crash.
2011-11-14 Wolfgang Sourdeau <wsourdeau@inverse.ca>
* GCSFolder.m

View File

@ -228,8 +228,8 @@ static GCSStringFormatter *stringFormatter = nil;
}
- (void)releaseChannel:(EOAdaptorChannel *)_channel {
if (debugOn) [self debugWithFormat:@"releasing channel: %@", _channel];
[[self _channelManager] releaseChannel:_channel];
if (debugOn) [self debugWithFormat:@"released channel: %@", _channel];
}
- (BOOL)canConnectStore {

View File

@ -221,8 +221,8 @@ static NSCharacterSet *asciiAlphaNumericCS = nil;
return ch;
}
- (void)releaseChannel:(EOAdaptorChannel *)_channel {
if (debugOn) [self debugWithFormat:@"releasing channel: %@", _channel];
[[self channelManager] releaseChannel:_channel];
if (debugOn) [self debugWithFormat:@"released channel: %@", _channel];
}
- (BOOL)canConnect {