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

ISPN-9009 Add test interrupting conflict resolution #5939

Merged
merged 1 commit into from Apr 26, 2018

Conversation

ryanemerson
Copy link
Contributor

https://issues.jboss.org/browse/ISPN-9009

@danberindei Creating a new PR to see how stable the test is now.

@ryanemerson
Copy link
Contributor Author

@danberindei 4 runs with no failure, so I think that confirms that the previous problems were caused by the old retry/cancel logic.

try {
blockedStateRequest.get(60, TimeUnit.SECONDS);
} catch (ExecutionException | InterruptedException | TimeoutException e) {
throw new IllegalStateException(e);
Copy link
Member

Choose a reason for hiding this comment

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

Rethrowing is no longer necessary

@danberindei danberindei merged commit 37a726f into infinispan:master Apr 26, 2018
@danberindei
Copy link
Member

Integrated, thanks Ryan!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
2 participants