Pull request for combined inputs to guard time functionality #25
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
Creating combined fix branch
Added checks for correct time type (setting or guard). Added test for guard time stopping modification. Modified copyright dates.
amarcionek
approved these changes
Nov 17, 2018
| /** | ||
| * This usually indicates a guard time - attributes should be changed only | ||
| * if the object's ctime matches the associated time, as specified by RFC | ||
| * 1813 (https://tools.ietf.org/html/rfc1813). The |
There was a problem hiding this comment.
Extra 'The' in the comment
| @@ -110,8 +138,10 @@ public String toString() { | |||
| * @see com.emc.ecs.nfsclient.nfs.NfsRequest#marshalling(com.emc.ecs.nfsclient.rpc.Xdr) | |||
| */ | |||
| public void marshalling(Xdr xdr) { | |||
| xdr.putInt(_timeSettingType); | |||
| if (SET_TO_CLIENT_TIME == _timeSettingType) { | |||
| if ( IS_BARE_TIME != _timeSettingType ) { | |||
There was a problem hiding this comment.
Would it make sense to use if (!isBareTime()) instead? Nitpicking, I know.
There was a problem hiding this comment.
I agree. Cleaned that up.
| guardTime, | ||
| new CredentialUnix(), 3)); | ||
|
|
||
| assertEquals(NfsStatus.NFS3ERR_NOT_SYNC.getValue(), setAttrResponse.getState()); |
ksteinfeldt
reviewed
Nov 27, 2018
There was a problem hiding this comment.
These seem to just undo 8ad3495? Maybe I'm misunderstanding.
ksteinfeldt
approved these changes
Nov 27, 2018
|
Will this be published to maven central as a new release? |
|
Yes, probably as soon as I get copyrights updated and have time for a release. |
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.
Any comments on this version, @amarcionek ? This should contain the same changes, with some of the class hierarchy changes but also preserving backwards compatibility for all code that doesn't use guard time. I didn't worry about the guard time code, since that wasn't working before the fix. I did tighten up input checking, so that clear exceptions would be raised immediately if code used the wrong time type.