jackrabbit-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ju...@apache.org
Subject svn commit: r661640 - in /jackrabbit/branches/1.4/jackrabbit-core: ./ src/main/java/org/apache/jackrabbit/core/data/db/ src/test/java/org/apache/jackrabbit/core/data/
Date Fri, 30 May 2008 10:40:12 GMT
Author: jukka
Date: Fri May 30 03:40:12 2008
New Revision: 661640

URL: http://svn.apache.org/viewvc?rev=661640&view=rev
Log:
1.4: Merged revisions 656655 and 656664 (JCR-1602)

Added:
    jackrabbit/branches/1.4/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/data/TempFileInputStreamTest.java
      - copied unchanged from r656664, jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/data/TempFileInputStreamTest.java
Modified:
    jackrabbit/branches/1.4/jackrabbit-core/   (props changed)
    jackrabbit/branches/1.4/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/data/db/TempFileInputStream.java
    jackrabbit/branches/1.4/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/data/TestAll.java

Propchange: jackrabbit/branches/1.4/jackrabbit-core/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri May 30 03:40:12 2008
@@ -1 +1 @@
-/jackrabbit/trunk/jackrabbit-core:653417,654078,654514,655917,656240,658583
+/jackrabbit/trunk/jackrabbit-core:653417,654078,654514,655917,656240,656655,656664,658583

Modified: jackrabbit/branches/1.4/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/data/db/TempFileInputStream.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/1.4/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/data/db/TempFileInputStream.java?rev=661640&r1=661639&r2=661640&view=diff
==============================================================================
--- jackrabbit/branches/1.4/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/data/db/TempFileInputStream.java
(original)
+++ jackrabbit/branches/1.4/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/data/db/TempFileInputStream.java
Fri May 30 03:40:12 2008
@@ -63,7 +63,7 @@
      * 
      * @param file the temporary file
      */
-    TempFileInputStream(File file) throws FileNotFoundException {
+    public TempFileInputStream(File file) throws FileNotFoundException {
         this.file = file;
         in = new BufferedInputStream(new FileInputStream(file));
     }
@@ -104,14 +104,23 @@
     }
     
     public int read(byte[] b, int off, int len) throws IOException {
+        if (closed) {
+            return -1;
+        }
         return closeIfEOF(in.read(b, off, len));
     }
 
     public int read(byte[] b) throws IOException {
+        if (closed) {
+            return -1;
+        }
         return closeIfEOF(in.read(b));
     }
 
     public int read() throws IOException {
+        if (closed) {
+            return -1;
+        }
         return closeIfEOF(in.read());
     }
 

Modified: jackrabbit/branches/1.4/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/data/TestAll.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/1.4/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/data/TestAll.java?rev=661640&r1=661639&r2=661640&view=diff
==============================================================================
--- jackrabbit/branches/1.4/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/data/TestAll.java
(original)
+++ jackrabbit/branches/1.4/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/data/TestAll.java
Fri May 30 03:40:12 2008
@@ -39,6 +39,7 @@
         suite.addTestSuite(GCEventListenerTest.class);
         suite.addTestSuite(PersistenceManagerIteratorTest.class);
         suite.addTestSuite(CopyValueTest.class);
+        suite.addTestSuite(TempFileInputStreamTest.class);
         return suite;
     }
 



Mime
View raw message