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 re...@apache.org on 2018/05/26 09:45:59 UTC
svn commit: r1832301 - in /jackrabbit/oak/branches/1.8: ./
oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/blob/LengthCachingDataStore.java
Author: reschke
Date: Sat May 26 09:45:59 2018
New Revision: 1832301
URL: http://svn.apache.org/viewvc?rev=1832301&view=rev
Log:
OAK-7161: LengthCachingDataStore's use of LineIterator.close() (ported to 1.8)
Modified:
jackrabbit/oak/branches/1.8/ (props changed)
jackrabbit/oak/branches/1.8/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/blob/LengthCachingDataStore.java
Propchange: jackrabbit/oak/branches/1.8/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat May 26 09:45:59 2018
@@ -1,3 +1,3 @@
/jackrabbit/oak/branches/1.0:1665962
-/jackrabbit/oak/trunk:1820660-1820661,1820729,1820734,1820859,1820861,1820878,1820888,1820947,1821027,1821130,1821140-1821141,1821178,1821240,1821249,1821258,1821325,1821358,1821361-1821362,1821370,1821375,1821393,1821477,1821487,1821516,1821617,1821663,1821665,1821668,1821681,1821847,1822121,1822201,1822207,1822723,1822808,1822850,1822934,1823135,1823163,1823169,1823172,1823655,1824196,1824198,1824896,1824962,1825065,1825362,1825381,1825442,1825448,1825466,1825470-1825471,1825475,1825523,1825525,1825619-1825621,1825651,1825654,1825992,1826079,1826090,1826096,1826237,1826338,1826516,1826532,1826551,1826560,1826640,1826932,1826957,1827472,1827486,1827977,1828529,1829527,1829569,1829854,1829864,1829987,1829998,1830019,1830160,1830197,1830748,1831157-1831158,1831163,1831374,1831560
+/jackrabbit/oak/trunk:1820660-1820661,1820729,1820734,1820859,1820861,1820878,1820888,1820947,1821027,1821130,1821140-1821141,1821178,1821237,1821240,1821249,1821258,1821325,1821358,1821361-1821362,1821370,1821375,1821393,1821477,1821487,1821516,1821617,1821663,1821665,1821668,1821681,1821847,1822121,1822201,1822207,1822723,1822808,1822850,1822934,1823135,1823163,1823169,1823172,1823655,1824196,1824198,1824896,1824962,1825065,1825362,1825381,1825442,1825448,1825466,1825470-1825471,1825475,1825523,1825525,1825619-1825621,1825651,1825654,1825992,1826079,1826090,1826096,1826237,1826338,1826516,1826532,1826551,1826560,1826640,1826932,1826957,1827472,1827486,1827977,1828529,1829527,1829569,1829854,1829864,1829987,1829998,1830019,1830160,1830197,1830748,1831157-1831158,1831163,1831374,1831560
/jackrabbit/trunk:1345480
Modified: jackrabbit/oak/branches/1.8/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/blob/LengthCachingDataStore.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/blob/LengthCachingDataStore.java?rev=1832301&r1=1832300&r2=1832301&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.8/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/blob/LengthCachingDataStore.java (original)
+++ jackrabbit/oak/branches/1.8/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/blob/LengthCachingDataStore.java Sat May 26 09:45:59 2018
@@ -342,7 +342,7 @@ public class LengthCachingDataStore exte
}
log.info("Total {} mapping entries found", mapping.size());
} finally {
- itr.close();
+ LineIterator.closeQuietly(itr);
}
return mapping;
}