zookeeper-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mic...@apache.org
Subject svn commit: r1550005 - in /zookeeper/trunk: CHANGES.txt src/java/main/org/apache/zookeeper/server/persistence/FileTxnLog.java
Date Wed, 11 Dec 2013 00:10:29 GMT
Author: michim
Date: Wed Dec 11 00:10:29 2013
New Revision: 1550005

URL: http://svn.apache.org/r1550005
Log:
ZOOKEEPER-1834. Catch IOException in FileTxnLog (fpj via michim)

Modified:
    zookeeper/trunk/CHANGES.txt
    zookeeper/trunk/src/java/main/org/apache/zookeeper/server/persistence/FileTxnLog.java

Modified: zookeeper/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/zookeeper/trunk/CHANGES.txt?rev=1550005&r1=1550004&r2=1550005&view=diff
==============================================================================
--- zookeeper/trunk/CHANGES.txt (original)
+++ zookeeper/trunk/CHANGES.txt Wed Dec 11 00:10:29 2013
@@ -491,6 +491,8 @@ BUGFIXES:
   ZOOKEEPER-1019. zkfuse doesn't list dependency on boost in README
   (Raul Gutierrez Segales via michim)
 
+  ZOOKEEPER-1834. Catch IOException in FileTxnLog (fpj via michim)
+
 IMPROVEMENTS:
 
   ZOOKEEPER-1170. Fix compiler (eclipse) warnings: unused imports,

Modified: zookeeper/trunk/src/java/main/org/apache/zookeeper/server/persistence/FileTxnLog.java
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/persistence/FileTxnLog.java?rev=1550005&r1=1550004&r2=1550005&view=diff
==============================================================================
--- zookeeper/trunk/src/java/main/org/apache/zookeeper/server/persistence/FileTxnLog.java
(original)
+++ zookeeper/trunk/src/java/main/org/apache/zookeeper/server/persistence/FileTxnLog.java
Wed Dec 11 00:10:29 2013
@@ -670,6 +670,9 @@ public class FileTxnLog implements TxnLo
                 }
                 // if we went to the next log file, we should call next() again
                 return next();
+            } catch (IOException e) {
+                inputStream.close();
+                throw e;
             }
             return true;
         }



Mime
View raw message