This commit is contained in:
didfet
2015-06-04 14:45:41 +02:00
parent 764ffba1ba
commit 56b932ee2e
4 changed files with 13 additions and 10 deletions

View File

@@ -17,12 +17,12 @@
<attribute name="maven.pomderived" value="true"/> <attribute name="maven.pomderived" value="true"/>
</attributes> </attributes>
</classpathentry> </classpathentry>
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER"> <classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources">
<attributes> <attributes>
<attribute name="maven.pomderived" value="true"/> <attribute name="maven.pomderived" value="true"/>
</attributes> </attributes>
</classpathentry> </classpathentry>
<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources"> <classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
<attributes> <attributes>
<attribute name="maven.pomderived" value="true"/> <attribute name="maven.pomderived" value="true"/>
</attributes> </attributes>

View File

@@ -17,7 +17,7 @@
</buildCommand> </buildCommand>
</buildSpec> </buildSpec>
<natures> <natures>
<nature>org.eclipse.jdt.core.javanature</nature>
<nature>org.eclipse.m2e.core.maven2Nature</nature> <nature>org.eclipse.m2e.core.maven2Nature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
</natures> </natures>
</projectDescription> </projectDescription>

View File

@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>logstash-forwarder-java</groupId> <groupId>logstash-forwarder-java</groupId>
<artifactId>logstash-forwarder-java</artifactId> <artifactId>logstash-forwarder-java</artifactId>
<version>0.2.0</version> <version>0.2.1-SNAPSHOT</version>
<name>logstash-forwarder-java</name> <name>logstash-forwarder-java</name>
<description>Java version of logstash forwarder</description> <description>Java version of logstash forwarder</description>
<url>https://github.com/didfet/logstash-forwarder-java</url> <url>https://github.com/didfet/logstash-forwarder-java</url>

View File

@@ -315,18 +315,21 @@ public class FileWatcher {
for(File file : oldWatchMap.keySet()) { for(File file : oldWatchMap.keySet()) {
FileState state = oldWatchMap.get(file); FileState state = oldWatchMap.get(file);
if(state.isDeleted()) { if(state.isDeleted()) {
if(markedList == null) { if(! file.exists()) {
markedList = new ArrayList<File>(); if(markedList == null) {
markedList = new ArrayList<File>();
}
markedList.add(file);
} }
markedList.add(file); try {
state.getRandomAccessFile().close();
} catch(Exception e) {}
} }
} }
if(markedList != null) { if(markedList != null) {
for(File file : markedList) { for(File file : markedList) {
FileState state = oldWatchMap.remove(file); FileState state = oldWatchMap.remove(file);
try {
state.getRandomAccessFile().close();
} catch(Exception e) {}
logger.trace("\tFile : " + file + " removed"); logger.trace("\tFile : " + file + " removed");
} }
} }