make sure we have token data on batch hit (#22260)

keybase · Jan 29, 2020 · 054fc11 · 054fc11
1 parent b308642
commit 054fc11
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/go/chat/search/storage.go b/go/chat/search/storage.go
@@ -167,7 +167,7 @@ func (b *batchingStore) GetTokenEntry(ctx context.Context, convID chat1.Conversa
 	b.Lock()
 	defer b.Unlock()
 	batch, ok := b.tokenBatch[convID.ConvIDStr()]
-	if ok {
+	if ok && batch.tokens[token] != nil {
 		return batch.tokens[token].dup(), nil
 	}
 	key, err := tokenKey(ctx, b.uid, convID, token, b.keyFn)