Skip to content

server: Refactor stream observer #95

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

Merged
merged 14 commits into from
Jul 25, 2019
Merged

server: Refactor stream observer #95

Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
f842871
Refactor discovery request stream observer
sschepens Mar 10, 2019
2824ec5
use field updater instead of atomicboolean
sschepens Mar 10, 2019
49af06c
Replace duplicate cancel logic with method call
sschepens Mar 13, 2019
f58fb74
Ads streams default to ANY_TYPE_URL
sschepens Mar 13, 2019
1a8602d
Style fixes
sschepens Mar 13, 2019
386a529
Fix ads discovery request on empty ackedresources
sschepens Mar 13, 2019
ed46a62
address comments
sschepens Jul 12, 2019
d369873
Merge remote-tracking branch 'upstream/master' into refactor-stream-o…
sschepens Jul 19, 2019
214ddca
fix wording
sschepens Jul 19, 2019
94dfbac
remove unused updater
sschepens Jul 19, 2019
e2f5152
remove unused import
sschepens Jul 19, 2019
b81ef44
small refactor
sschepens Jul 19, 2019
3d82263
make defaultTypeUrl private
sschepens Jul 19, 2019
5f91376
remove unnecessary line break
sschepens Jul 25, 2019
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
remove unnecessary line break 
Signed-off-by: Sebastian Schepens <[email protected]>
  • Loading branch information
@sschepens
sschepens committed Jul 25, 2019
commit 5f91376589f6e7eb8b7c0c7b63c3149529c2d130
3 changes: 1 addition & 2 deletions server/src/main/java/io/envoyproxy/controlplane/server/DiscoveryRequestStreamObserver.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,8 +74,7 @@ public void onNext(DiscoveryRequest request) {
DiscoveryResponse latestResponse = latestResponse(requestTypeUrl);
String resourceNonce = latestResponse == null ? null : latestResponse.getNonce();

if (isNullOrEmpty(resourceNonce)
|| resourceNonce.equals(nonce)) {
if (isNullOrEmpty(resourceNonce) || resourceNonce.equals(nonce)) {
if (!request.hasErrorDetail() && latestResponse != null) {
Set<String> ackedResourcesForType = latestResponse.getResourcesList()
.stream()
Expand Down