Revert "oc: cached usercontext updates indexing_context"
This reverts commit 0750f64b787db088e944756b66fbd0883cf44cbf.pull/69/head
parent
05578bfcb6
commit
bb9764bc6b
|
@ -42,7 +42,6 @@
|
|||
- (id) initForUsername: (NSString *) username
|
||||
withIndexing: (struct indexing_context *) indexing;
|
||||
|
||||
- (void) updateIndexing: (struct indexing_context *) indexing;
|
||||
|
||||
- (void) increaseUseCount;
|
||||
- (void) decreaseUseCount;
|
||||
|
|
|
@ -119,11 +119,6 @@ MAPIStoreMappingKeyFromId (uint64_t idNbr)
|
|||
return self;
|
||||
}
|
||||
|
||||
- (void) updateIndexing: (struct indexing_context *) newIndexing
|
||||
{
|
||||
indexing = newIndexing;
|
||||
}
|
||||
|
||||
- (void) dealloc
|
||||
{
|
||||
[username release];
|
||||
|
|
|
@ -68,8 +68,6 @@
|
|||
- (id) initWithUsername: (NSString *) newUsername
|
||||
andTDBIndexing: (struct indexing_context *) indexing;
|
||||
|
||||
- (void) updateIndexing: (struct indexing_context *) indexing;
|
||||
|
||||
- (NSString *) username;
|
||||
- (SOGoUser *) sogoUser;
|
||||
|
||||
|
|
|
@ -65,14 +65,7 @@ static NSMapTable *contextsTable = nil;
|
|||
id userContext;
|
||||
|
||||
userContext = [contextsTable objectForKey: username];
|
||||
if (userContext)
|
||||
{
|
||||
// The indexing_context used when this user context was created
|
||||
// could had been freed, so we have to update it and use the one
|
||||
// that we receive as parameter (which is a valid one for sure).
|
||||
[userContext updateIndexing: indexing];
|
||||
}
|
||||
else
|
||||
if (!userContext)
|
||||
{
|
||||
userContext = [[self alloc] initWithUsername: username
|
||||
andTDBIndexing: indexing];
|
||||
|
@ -83,11 +76,6 @@ static NSMapTable *contextsTable = nil;
|
|||
return userContext;
|
||||
}
|
||||
|
||||
- (void) updateIndexing: (struct indexing_context *) indexing
|
||||
{
|
||||
[mapping updateIndexing: indexing];
|
||||
}
|
||||
|
||||
- (id) init
|
||||
{
|
||||
if ((self = [super init]))
|
||||
|
|
Loading…
Reference in New Issue