amorfo77/sogo
1
0
Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-09-21 13:18:34 +00:00
Code Issues Projects Releases Wiki Activity

fix(core): avoid pooling channels with tools (fixes #4684)

Browse Source
This commit is contained in:
Ludovic Marcotte
2020-07-10 10:22:48 -04:00
parent a91a00e33c
commit cecf157dca
13 changed files with 42 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Tools/SOGoToolRenameUser.m
+8 -8
View File
@@ -1,6 +1,6 @@
/* SOGoToolRenameUser.m - this file is part of SOGo
*
* Copyright (C) 2011-2017 Inverse inc
* Copyright (C) 2011-2020 Inverse inc
*
* This file is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -147,7 +147,7 @@
else
rc = [ac commitTransaction];
[cm releaseChannel: fc];
[cm releaseChannel: fc immediately: YES];
return rc;
}
@@ -200,7 +200,7 @@
else
rc = [ac commitTransaction];
[cm releaseChannel: fc];
[cm releaseChannel: fc immediately: YES];
return rc;
}
@@ -245,7 +245,7 @@
while ((row = [fc fetchAttributes: attrs withZone: NULL]))
[subscribers addObject: [row objectForKey: @"c_uid"]];
[fc cancelFetch];
[cm releaseChannel: fc];
[cm releaseChannel: fc immediately: YES];
return subscribers;
}
@@ -446,7 +446,7 @@
sql = [NSString stringWithFormat: @"UPDATE %@ SET c_object = '%@'",
[location gcsTableName], newObjectPath];
[ac evaluateExpressionX: sql];
[cm releaseChannel: ac];
[cm releaseChannel: ac immediately: YES];
}
[pool release];
@@ -480,7 +480,7 @@
fromSQLUser: sqlFromUserID
toSQLUser: sqlToUserID];
[fc cancelFetch];
[cm releaseChannel: fc];
[cm releaseChannel: fc immediately: YES];
}
- (void) _updateForeignACLsForLocation: (NSString *) locationString
@@ -505,7 +505,7 @@
[location gcsTableName],
sqlToUserID, sqlFromUserID];
[tc evaluateExpressionX: sql];
[cm releaseChannel: tc];
[cm releaseChannel: tc immediately: YES];
[pool release];
}
@@ -537,7 +537,7 @@
fromSQLUser: sqlFromUserID
toSQLUser: sqlToUserID];
[fc cancelFetch];
[cm releaseChannel: fc];
[cm releaseChannel: fc immediately: YES];
}
- (BOOL) proceed