You are viewing a plain text version of this content. The canonical link for it is here.

Posted to oak-commits@jackrabbit.apache.org by md...@apache.org on 2018/02/28 16:40:06 UTC

svn commit: r1825582 - /jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/tar/TarWriter.java

Author: mduerig
Date: Wed Feb 28 16:40:06 2018
New Revision: 1825582

URL: http://svn.apache.org/viewvc?rev=1825582&view=rev
Log:
OAK-6707: TarWriter.close() must not throw an exception on subsequent invocations

Modified:
    jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/tar/TarWriter.java

Modified: jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/tar/TarWriter.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/tar/TarWriter.java?rev=1825582&r1=1825581&r2=1825582&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/tar/TarWriter.java (original)
+++ jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/tar/TarWriter.java Wed Feb 28 16:40:06 2018
@@ -201,7 +201,9 @@ class TarWriter implements Closeable {
         // this part, as no other synchronized methods should get invoked
         // once close() has been initiated (see related checkState calls).
         synchronized (this) {
-            checkState(!closed);
+            if (closed) {
+                return;
+            }
             closed = true;
         }