Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix NPE in PendingDelete#toString #11032

Merged
merged 1 commit into from May 7, 2015

Conversation

kimchy
Copy link
Member

@kimchy kimchy commented May 7, 2015

No description provided.

@@ -712,7 +729,7 @@ public void processPendingDeletes(Index index, @IndexSettings Settings indexSett
logger.debug("{} retry pending delete", ex, index);
}
} else {
ShardLock shardLock = locks.get(delete.shardId);
ShardLock shardLock = locks.get(new ShardId(delete.index, delete.shardId));
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you just assert that delete.shardId >= 0?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

sure!

@jpountz
Copy link
Contributor

jpountz commented May 7, 2015

LGTM

@kimchy kimchy added the >bug label May 7, 2015
@kimchy kimchy merged commit 8128f39 into elastic:master May 7, 2015
@kevinkluge kevinkluge removed the review label May 7, 2015
kimchy added a commit that referenced this pull request May 7, 2015
kimchy added a commit that referenced this pull request May 7, 2015
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants