git-svn-id: http://svn.opengroupware.org/SOGo/trunk@150 d1b88da0-ebda-0310-925b-ed51d...

diff --git a/OGoContentStore/ChangeLog b/OGoContentStore/ChangeLog
index 447d52a7b056bbaf35d4bfb92becc3029da119a4..df1a23a169cfa1ff22bf2a19bfa08a69e22da2f7 100644 (file)
--- a/OGoContentStore/ChangeLog
+++ b/OGoContentStore/ChangeLog
@@ -1,3 +1,8 @@
+2004-07-20  Helge Hess  <helge.hess@opengroupware.org>
+
+       * OCSChannelManager.m: fixed a bug in the channel GC which resulted
+         in an exception during the GC NSTimer
+
 2004-07-16  Helge Hess  <helge.hess@skyrix.com>
 
        * improved error handling in various files

diff --git a/OGoContentStore/OCSChannelManager.m b/OGoContentStore/OCSChannelManager.m
index d891bfc6bc751e976ae772d0d5bdac7a5d9ac910..f678bd02437322242121f598a4c7a860e688d4c0 100644 (file)
--- a/OGoContentStore/OCSChannelManager.m
+++ b/OGoContentStore/OCSChannelManager.m
@@ -394,12 +394,14 @@ static NSTimeInterval ChannelCollectionTimer = 5 * 60;
   for (i = 0; i < count; i++) {
     OCSChannelHandle *handle;
     
-    handle = [[self->availableChannels objectAtIndex:i] retain];
+    handle = [[handlesToRemove objectAtIndex:i] retain];
     [self->availableChannels removeObject:handle];
     if ([[handle channel] isOpen])
       [[handle channel] closeChannel];
     [handle release];
   }
+  
+  [handlesToRemove release];
 }
 
 /* debugging */