Skip to content

Support for Objectify-context bound completeAllPendingFutures() calls (see https://github.com/objectify/objectify/issues/326) #398

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.

Sign up for GitHub

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

Open
nbali wants to merge 3 commits into
base: v5
Choose a base branch
from
Open

Support for Objectify-context bound completeAllPendingFutures() calls (see https://github.com/objectify/objectify/issues/326) #398

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0fe1d2b
Support for Objectify-context bound completeAllPendingFutures() calls…
nbali Aug 14, 2018
68cdc05
Enforcing the legacy behaviour of waiting for every pending future, i…
nbali Aug 14, 2018
b269447
Travis should only use JDK8
stickfigure Oct 16, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Enforcing the legacy behaviour of waiting for every pending future, i… 
…f we are closing the last Objectify instance
  • Loading branch information
@nbali
nbali committed Aug 14, 2018
commit 68cdc05c3aa7e642ca9fef7959c8355f054f2497
10 changes: 9 additions & 1 deletion src/main/java/com/googlecode/objectify/ObjectifyService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,15 @@ public void close() {

ofy.flush();

PendingFutures.completeAllPendingFutures(ofy);
if (stack.size() > 1) {
// we have multiple Objectify instances in the stack
// so wait only for the pending futures associated with the currently closed one
PendingFutures.completeAllPendingFutures(ofy);
} else {
// this is the very last Objectify instance present
// we should wait for every pending future just to be sure
PendingFutures.completeAllPendingFutures();
}

stack.removeLast();
}
Expand Down