INT-4185: Fix FileReadingMessageSource for Java 6 #2004
Closed
Conversation
This file contains hidden or 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
JIRA: https://jira.spring.io/browse/INT-4185 Even if `WatchEventType` doesn't expose Java 7 API, its instantiation leads to the `StandardWatchEventKinds` object which already isn't Java 6 * Move `this.watchEvents = new WatchEventType[] { WatchEventType.CREATE }` to the ctor and guard it with the `ClassUtils.isPresent("java.nio.file.WatchService")`
garyrussell
reviewed
Dec 15, 2016
| @@ -161,6 +165,9 @@ public FileReadingMessageSource(int internalQueueCapacity) { | |||
| public FileReadingMessageSource(Comparator<File> receptionOrderComparator) { | |||
| this.toBeReceived = new PriorityBlockingQueue<File>( | |||
| DEFAULT_INTERNAL_QUEUE_CAPACITY, receptionOrderComparator); | |||
| if (WATCH_SERVICE_PRESENT) { | |||
| this.watchEvents = new WatchEventType[] { WatchEventType.CREATE }; | |||
| } | |||
There was a problem hiding this comment.
else {
this.useWatchService = false;
}
Also, need to prevent setting to true (perhaps events too) - and reflect that in the javadocs.
There was a problem hiding this comment.
Yeah! Agree about Assert.state() in the setUseWatchService(), but not sure what that event should mean...
There was a problem hiding this comment.
I mean add an assertion in setWatchEvents() too.
|
Looks like you missed my request to force If you agree, I can fix on merge. |
|
Oops - sorry - it's false by default 😄 |
Eh... That was my point 😉 |
|
Merged as 6a51da6 |
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.
JIRA: https://jira.spring.io/browse/INT-4185
Even if
WatchEventTypedoesn't expose Java 7 API, its instantiation leads to theStandardWatchEventKindsobject which already isn't Java 6this.watchEvents = new WatchEventType[] { WatchEventType.CREATE }to the ctor and guard it with theClassUtils.isPresent("java.nio.file.WatchService")Tested on Java 6 locally