KAA-1650: Don't set the body present flag in extension options if body size is equal to zero #1369
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
garniy
previously approved these changes
Dec 8, 2016
vtkhir
suggested changes
Dec 8, 2016
| @@ -424,7 +424,8 @@ private void encode(GrowingByteBuffer buf, LogServerSync logSync) { | |||
| private void encode(GrowingByteBuffer buf, ConfigurationServerSync configurationSync) { | |||
| int option = 0; | |||
| boolean confSchemaPresent = configurationSync.getConfSchemaBody() != null; | |||
| boolean confBodyPresent = configurationSync.getConfDeltaBody() != null; | |||
| boolean confBodyPresent = configurationSync.getConfDeltaBody() != null | |||
| && configurationSync.getConfDeltaBody().array().length != 0; | |||
There was a problem hiding this comment.
Call hasArray() method before invoking array()
|
/cc @vtkhir |
vtkhir
suggested changes
Dec 8, 2016
| @@ -423,8 +423,12 @@ private void encode(GrowingByteBuffer buf, LogServerSync logSync) { | |||
|
|
|||
| private void encode(GrowingByteBuffer buf, ConfigurationServerSync configurationSync) { | |||
| int option = 0; | |||
| boolean confSchemaPresent = configurationSync.getConfSchemaBody() != null; | |||
| boolean confBodyPresent = configurationSync.getConfDeltaBody() != null; | |||
| boolean confSchemaPresent = configurationSync.getConfSchemaBody() != null | |||
There was a problem hiding this comment.
Please extract configurationSync.getConfSchemaBody() to local variable
| boolean confSchemaPresent = configurationSync.getConfSchemaBody() != null | ||
| && configurationSync.getConfSchemaBody().hasArray() | ||
| && configurationSync.getConfSchemaBody().array().length != 0; | ||
| boolean confBodyPresent = configurationSync.getConfDeltaBody() != null |
There was a problem hiding this comment.
Please extract configurationSync.getConfDeltaBody() to local variable
| && configurationSync.getConfSchemaBody().array().length != 0; | ||
| boolean confBodyPresent = configurationSync.getConfDeltaBody() != null | ||
| && configurationSync.getConfSchemaBody().hasArray() | ||
| && configurationSync.getConfDeltaBody().array().length != 0; |
…y size is equal to zero
vtkhir
approved these changes
Dec 9, 2016
|
Jenkins failure is caused by KAA-1640 and is not related to the PR. |
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.
/cc @GamovCoder @Sergio-Dev