You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tika.apache.org by ma...@apache.org on 2013/06/16 21:13:56 UTC
svn commit: r1493574 - in /tika/trunk: CHANGES.txt
tika-core/src/main/java/org/apache/tika/io/TailStream.java
tika-core/src/test/java/org/apache/tika/io/TailStreamTest.java
Author: mattmann
Date: Sun Jun 16 19:13:56 2013
New Revision: 1493574
URL: http://svn.apache.org/r1493574
Log:
Updated patch for TIKA-991 contributed by Oliver Heger
Modified:
tika/trunk/CHANGES.txt
tika/trunk/tika-core/src/main/java/org/apache/tika/io/TailStream.java
tika/trunk/tika-core/src/test/java/org/apache/tika/io/TailStreamTest.java
Modified: tika/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/tika/trunk/CHANGES.txt?rev=1493574&r1=1493573&r2=1493574&view=diff
==============================================================================
--- tika/trunk/CHANGES.txt (original)
+++ tika/trunk/CHANGES.txt Sun Jun 16 19:13:56 2013
@@ -1,3 +1,6 @@
+Release 1.5 - Current Development
+
+
Release 1.4 - 06/15/2013
* Removed a test HTML file with a poorly chosen GPL text in it (TIKA-1129).
Modified: tika/trunk/tika-core/src/main/java/org/apache/tika/io/TailStream.java
URL: http://svn.apache.org/viewvc/tika/trunk/tika-core/src/main/java/org/apache/tika/io/TailStream.java?rev=1493574&r1=1493573&r2=1493574&view=diff
==============================================================================
--- tika/trunk/tika-core/src/main/java/org/apache/tika/io/TailStream.java (original)
+++ tika/trunk/tika-core/src/main/java/org/apache/tika/io/TailStream.java Sun Jun 16 19:13:56 2013
@@ -143,8 +143,8 @@ public class TailStream extends FilterIn
bytesSkipped += bytesRead;
}
}
-
- return bytesSkipped;
+
+ return (bytesRead < 0 && bytesSkipped == 0) ? -1 : bytesSkipped;
}
/**
Modified: tika/trunk/tika-core/src/test/java/org/apache/tika/io/TailStreamTest.java
URL: http://svn.apache.org/viewvc/tika/trunk/tika-core/src/test/java/org/apache/tika/io/TailStreamTest.java?rev=1493574&r1=1493573&r2=1493574&view=diff
==============================================================================
--- tika/trunk/tika-core/src/test/java/org/apache/tika/io/TailStreamTest.java (original)
+++ tika/trunk/tika-core/src/test/java/org/apache/tika/io/TailStreamTest.java Sun Jun 16 19:13:56 2013
@@ -214,4 +214,16 @@ public class TailStreamTest
new String(stream.getTail()));
stream.close();
}
+
+ /**
+ * Tests skip() if read reaches the end of the stream and returns -1.
+ */
+ @Test
+ public void testSkipReadEnd() throws IOException
+ {
+ final int count = 128;
+ TailStream stream = new TailStream(generateStream(0, count), 2 * count);
+ readStream(stream);
+ assertEquals("Wrong result", -1, stream.skip(1));
+ }
}