PSK identity related fixes #320
Closed
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
sbernard31
reviewed
Apr 12, 2017
| if (info.getIdentity() != null) { | ||
| // populate the secondary index (security info by PSK id) | ||
| String oldEndpoint; | ||
| if ((oldEndpoint = j.hget(PSKID_SEC, info.getIdentity())) != null |
There was a problem hiding this comment.
In the Leshan code base, we generally don't initialize variable in if condition.
Could you please, move the initialization out of the if ?
String oldEndpoint = j.hget(PSKID_SEC, info.getIdentity();
if (oldEndpoint != null ...| byte[] previousData = j.getSet((SEC_EP + info.getEndpoint()).getBytes(), data); | ||
| SecurityInfo previous = previousData == null ? null : deserialize(previousData); | ||
| String previousIdentity; | ||
| if (previous != null && (previousIdentity = previous.getIdentity()) != null |
There was a problem hiding this comment.
Same thing about variable initialization here.
If you really want to avoid to call several time previous.getIdentity() several time, you will probably need to create 2 if blocks. Personally I'm ok if you choose to not put previous.getIdentity() in a variable.
| @@ -98,6 +98,11 @@ public SecurityInfo add(SecurityInfo info) throws NonUniqueSecurityInfoException | |||
| } | |||
|
|
|||
| SecurityInfo previous = securityByEp.put(info.getEndpoint(), info); | |||
| String previousIdentity; | |||
| if (previous != null && (previousIdentity = previous.getIdentity()) != null | |||
There was a problem hiding this comment.
Same comment than above.
Signed-off-by: Ville Skyttä <ville.skytta@iki.fi>
Signed-off-by: Ville Skyttä <ville.skytta@iki.fi>
Signed-off-by: Ville Skyttä <ville.skytta@iki.fi>
Signed-off-by: Ville Skyttä <ville.skytta@iki.fi>
|
Comments addressed, rebased. |
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.
No description provided.