Update dstore/Cache::put #154
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
src/Cache.js
Outdated
| cachingStore.remove((directives && directives.id) || this.getIdentity(object)); | ||
| return when(this.inherited(arguments), function (result) { | ||
| cachingStore.put(object, directives); | ||
| return when(this.inherited(arguments)).then(function (result) { | ||
| // now put result in cache | ||
| var cachedPutResult = | ||
| cachingStore.put(object && typeof result === 'object' ? result : object, directives); |
There was a problem hiding this comment.
This can be reduced to an if, since if result is not an object, we've already done this prior to calling inherited.
|
This looks good to me. |
edhager
force-pushed
the
master
branch
2 times, most recently
from
1dbb25d to
a5655fe
Compare
|
I think this one needs a rebase. We have enough things to do a 1.2 release soon so we should rebase and land this if time permits @kitsonk. |
|
Yeah, the rebase totally screwed up... 😢 This is simply too stale. |
Previous behaviour was to remove the item while waiting for return from the master store. Now Cache will presume the update will complete and only remove the item if the master store rejects the `put`.
|
A cherry-pick to a new branch worked. |
dylans
approved these changes
May 24, 2017
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Previous behaviour was to remove the item while waiting for return from the master store. Now Cache will presume the update will complete and only remove the item if the master store rejects the
put.Fixes #117.