diff --git a/pom.xml b/pom.xml index 82bccbe..ad389ad 100644 --- a/pom.xml +++ b/pom.xml @@ -165,6 +165,11 @@ commons-cli 1.2 + + edu.ucar + unidataCommon + 4.2.20 + \ No newline at end of file diff --git a/src/main/java/info/fetter/logstashforwarder/FileReader.java b/src/main/java/info/fetter/logstashforwarder/FileReader.java index c092a1e..460dc19 100644 --- a/src/main/java/info/fetter/logstashforwarder/FileReader.java +++ b/src/main/java/info/fetter/logstashforwarder/FileReader.java @@ -21,7 +21,7 @@ import info.fetter.logstashforwarder.util.AdapterException; import java.io.File; import java.io.IOException; -import java.io.RandomAccessFile; +//import java.io.RandomAccessFile; import java.util.Arrays; import java.util.Collection; import java.util.HashMap; @@ -29,6 +29,8 @@ import java.util.Map; import org.apache.log4j.Logger; +import ucar.unidata.io.RandomAccessFile; + public class FileReader extends Reader { private static Logger logger = Logger.getLogger(FileReader.class); private static final byte[] ZIP_MAGIC = new byte[] {(byte) 0x50, (byte) 0x4b, (byte) 0x03, (byte) 0x04}; diff --git a/src/main/java/info/fetter/logstashforwarder/FileSigner.java b/src/main/java/info/fetter/logstashforwarder/FileSigner.java index f130b0b..f02c7e2 100644 --- a/src/main/java/info/fetter/logstashforwarder/FileSigner.java +++ b/src/main/java/info/fetter/logstashforwarder/FileSigner.java @@ -1,9 +1,11 @@ package info.fetter.logstashforwarder; import java.io.IOException; -import java.io.RandomAccessFile; +//import java.io.RandomAccessFile; import java.util.zip.Adler32; +import ucar.unidata.io.RandomAccessFile; + public class FileSigner { private static final Adler32 adler32 = new Adler32(); diff --git a/src/main/java/info/fetter/logstashforwarder/FileState.java b/src/main/java/info/fetter/logstashforwarder/FileState.java index 5933100..35fa6b9 100644 --- a/src/main/java/info/fetter/logstashforwarder/FileState.java +++ b/src/main/java/info/fetter/logstashforwarder/FileState.java @@ -20,10 +20,13 @@ package info.fetter.logstashforwarder; import java.io.File; import java.io.FileNotFoundException; import java.io.IOException; -import java.io.RandomAccessFile; +//import java.io.RandomAccessFile; + import org.apache.commons.lang.builder.ToStringBuilder; +import ucar.unidata.io.RandomAccessFile; + import com.fasterxml.jackson.annotation.JsonIgnore; public class FileState { @@ -56,7 +59,7 @@ public class FileState { this.file = file; directory = file.getCanonicalFile().getParent(); fileName = file.getName(); - randomAccessFile = new RandomAccessFile(file, "r"); + randomAccessFile = new RandomAccessFile(file.getPath(), "r"); lastModified = file.lastModified(); size = file.length(); }