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 to...@apache.org on 2015/04/22 13:16:32 UTC
svn commit: r1675334 - in /jackrabbit/oak/branches/1.2: ./
oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/OakDirectory.java
Author: tommaso
Date: Wed Apr 22 11:16:32 2015
New Revision: 1675334
URL: http://svn.apache.org/r1675334
Log:
OAK-2798 - OakDirectory's IndexInput,Output should release/unset resources on close (branch 1.2)
Modified:
jackrabbit/oak/branches/1.2/ (props changed)
jackrabbit/oak/branches/1.2/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/OakDirectory.java
Propchange: jackrabbit/oak/branches/1.2/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Apr 22 11:16:32 2015
@@ -1,3 +1,3 @@
/jackrabbit/oak/branches/1.0:1665962
-/jackrabbit/oak/trunk:1672350,1672468,1672537,1672603,1672834-1672835,1673351,1673410,1673436,1673644,1673662-1673664,1673669,1673695,1674046,1674065,1674075,1674107,1674228,1674880,1675055
+/jackrabbit/oak/trunk:1672350,1672468,1672537,1672603,1672834-1672835,1673351,1673410,1673436,1673644,1673662-1673664,1673669,1673695,1674046,1674065,1674075,1674107,1674228,1674880,1675055,1675332
/jackrabbit/trunk:1345480
Modified: jackrabbit/oak/branches/1.2/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/OakDirectory.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.2/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/OakDirectory.java?rev=1675334&r1=1675333&r2=1675334&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.2/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/OakDirectory.java (original)
+++ jackrabbit/oak/branches/1.2/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/OakDirectory.java Wed Apr 22 11:16:32 2015
@@ -164,13 +164,13 @@ class OakDirectory extends Directory {
private long length;
- private final List<Blob> data;
+ private List<Blob> data;
private boolean dataModified = false;
private int index = -1;
- private final byte[] blob;
+ private byte[] blob;
private boolean blobModified = false;
@@ -374,7 +374,8 @@ class OakDirectory extends Directory {
@Override
public void close() {
- // do nothing
+ file.blob = null;
+ file.data = null;
}
}
@@ -421,6 +422,8 @@ class OakDirectory extends Directory {
@Override
public void close() throws IOException {
flush();
+ file.blob = null;
+ file.data = null;
}
}