From 5758f1d848067d61ec1e9c1ba81269c687bb38f5 Mon Sep 17 00:00:00 2001 From: Wolfgang Sourdeau Date: Thu, 8 Dec 2011 15:03:09 +0000 Subject: [PATCH] Monotone-Parent: 9c4be3d7d32f456638c073296f3c3b84ca2f6ea9 Monotone-Revision: 3c7a201fa0fd3707b904e5173f62765c592e904b Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2011-12-08T15:03:09 --- SOPE/GDLContentStore/ChangeLog | 8 ++++++++ SOPE/GDLContentStore/GCSFolder.m | 2 +- SOPE/GDLContentStore/GCSFolderManager.m | 2 +- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/SOPE/GDLContentStore/ChangeLog b/SOPE/GDLContentStore/ChangeLog index 8a9cc08dd..377624de2 100644 --- a/SOPE/GDLContentStore/ChangeLog +++ b/SOPE/GDLContentStore/ChangeLog @@ -1,3 +1,11 @@ +2011-12-08 Wolfgang Sourdeau + + * 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 * GCSFolder.m diff --git a/SOPE/GDLContentStore/GCSFolder.m b/SOPE/GDLContentStore/GCSFolder.m index 7d87f17e1..51a931f7f 100644 --- a/SOPE/GDLContentStore/GCSFolder.m +++ b/SOPE/GDLContentStore/GCSFolder.m @@ -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 { diff --git a/SOPE/GDLContentStore/GCSFolderManager.m b/SOPE/GDLContentStore/GCSFolderManager.m index 0078f9b68..f333c9951 100644 --- a/SOPE/GDLContentStore/GCSFolderManager.m +++ b/SOPE/GDLContentStore/GCSFolderManager.m @@ -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 {