Spring/spring-integration
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

INT-3574: Polishing

Browse Source 
Synchronize state clearance when message received while stopped.

Make `DefaultFlushPredicate` `static`.
This commit is contained in:
Gary Russell
2016-01-15 11:04:37 -05:00
parent c7724c340c
commit baa8fdc4f5
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
spring-integration-file/src/main/java/org/springframework/integration/file/FileWritingMessageHandler.java
View File

@@ -510,9 +510,7 @@ public class FileWritingMessageHandler extends AbstractReplyProducingMessageHand
try {
if (state == null || FileWritingMessageHandler.this.flushTask == null) {
bos.close();
if (state != null) {
fileStates.remove(fileToWriteTo.getAbsolutePath());
}
clearState(fileToWriteTo, state);
}
else {
state.lastWrite = System.currentTimeMillis();
@@ -584,9 +582,7 @@ public class FileWritingMessageHandler extends AbstractReplyProducingMessageHand
try {
if (state == null || FileWritingMessageHandler.this.flushTask == null) {
bos.close();
if (state != null) {
fileStates.remove(fileToWriteTo.getAbsolutePath());
}
clearState(fileToWriteTo, state);
}
else {
state.lastWrite = System.currentTimeMillis();
@@ -627,9 +623,7 @@ public class FileWritingMessageHandler extends AbstractReplyProducingMessageHand
try {
if (state == null || FileWritingMessageHandler.this.flushTask == null) {
writer.close();
if (state != null) {
fileStates.remove(fileToWriteTo.getAbsolutePath());
}
clearState(fileToWriteTo, state);
}
else {
state.lastWrite = System.currentTimeMillis();
@@ -832,6 +826,12 @@ public class FileWritingMessageHandler extends AbstractReplyProducingMessageHand
}
}
private synchronized void clearState(final File fileToWriteTo, final FileState state) {
if (state != null) {
fileStates.remove(fileToWriteTo.getAbsolutePath());
}
}
private static final class FileState {
@@ -932,7 +932,7 @@ public class FileWritingMessageHandler extends AbstractReplyProducingMessageHand
/**
* Flushes files where the path matches a pattern, regardless of last write time.
*/
private final class DefaultFlushPredicate implements MessageFlushPredicate {
private static final class DefaultFlushPredicate implements MessageFlushPredicate {
@Override
public boolean shouldFlush(String fileAbsolutePath, long lastWrite, Message<?> triggerMessage) {