You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2013/01/24 17:44:06 UTC
svn commit: r1438068 - in /camel/trunk:
components/camel-leveldb/src/main/java/org/apache/camel/component/leveldb/LevelDBAggregationRepository.java
components/camel-leveldb/src/main/java/org/apache/camel/component/leveldb/LevelDBFile.java
parent/pom.xml
Author: davsclaus
Date: Thu Jan 24 16:44:06 2013
New Revision: 1438068
URL: http://svn.apache.org/viewvc?rev=1438068&view=rev
Log:
Upgraded to leveldb 1.5
Modified:
camel/trunk/components/camel-leveldb/src/main/java/org/apache/camel/component/leveldb/LevelDBAggregationRepository.java
camel/trunk/components/camel-leveldb/src/main/java/org/apache/camel/component/leveldb/LevelDBFile.java
camel/trunk/parent/pom.xml
Modified: camel/trunk/components/camel-leveldb/src/main/java/org/apache/camel/component/leveldb/LevelDBAggregationRepository.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-leveldb/src/main/java/org/apache/camel/component/leveldb/LevelDBAggregationRepository.java?rev=1438068&r1=1438067&r2=1438068&view=diff
==============================================================================
--- camel/trunk/components/camel-leveldb/src/main/java/org/apache/camel/component/leveldb/LevelDBAggregationRepository.java (original)
+++ camel/trunk/components/camel-leveldb/src/main/java/org/apache/camel/component/leveldb/LevelDBAggregationRepository.java Thu Jan 24 16:44:06 2013
@@ -27,6 +27,7 @@ import org.apache.camel.CamelContext;
import org.apache.camel.Exchange;
import org.apache.camel.spi.RecoverableAggregationRepository;
import org.apache.camel.support.ServiceSupport;
+import org.apache.camel.util.IOHelper;
import org.apache.camel.util.ObjectHelper;
import org.apache.camel.util.ServiceHelper;
import org.fusesource.hawtbuf.Buffer;
@@ -227,7 +228,7 @@ public class LevelDBAggregationRepositor
}
} finally {
// Make sure you close the iterator to avoid resource leaks.
- it.close();
+ IOHelper.close(it);
}
return Collections.unmodifiableSet(keys);
@@ -262,7 +263,7 @@ public class LevelDBAggregationRepositor
}
} finally {
// Make sure you close the iterator to avoid resource leaks.
- it.close();
+ IOHelper.close(it);
}
if (answer.size() == 0) {
@@ -309,7 +310,7 @@ public class LevelDBAggregationRepositor
}
} finally {
// Make sure you close the iterator to avoid resource leaks.
- it.close();
+ IOHelper.close(it);
}
LOG.debug("Size of repository [{}] -> {}", repositoryName, count);
Modified: camel/trunk/components/camel-leveldb/src/main/java/org/apache/camel/component/leveldb/LevelDBFile.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-leveldb/src/main/java/org/apache/camel/component/leveldb/LevelDBFile.java?rev=1438068&r1=1438067&r2=1438068&view=diff
==============================================================================
--- camel/trunk/components/camel-leveldb/src/main/java/org/apache/camel/component/leveldb/LevelDBFile.java (original)
+++ camel/trunk/components/camel-leveldb/src/main/java/org/apache/camel/component/leveldb/LevelDBFile.java Thu Jan 24 16:44:06 2013
@@ -20,6 +20,7 @@ import java.io.File;
import java.io.IOException;
import org.apache.camel.Service;
+import org.apache.camel.util.IOHelper;
import org.iq80.leveldb.CompressionType;
import org.iq80.leveldb.DB;
import org.iq80.leveldb.Options;
@@ -182,7 +183,7 @@ public class LevelDBFile implements Serv
LOG.debug("Stopping LevelDB using file: {}", file);
if (db != null) {
- db.close();
+ IOHelper.close(db);
db = null;
}
}
Modified: camel/trunk/parent/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/parent/pom.xml?rev=1438068&r1=1438067&r2=1438068&view=diff
==============================================================================
--- camel/trunk/parent/pom.xml (original)
+++ camel/trunk/parent/pom.xml Thu Jan 24 16:44:06 2013
@@ -226,7 +226,7 @@
<karaf-version>2.3.0</karaf-version>
<krati-version>0.4.8</krati-version>
<kxml2-bundle-version>2.3.0_2</kxml2-bundle-version>
- <leveldbjni-version>1.3</leveldbjni-version>
+ <leveldbjni-version>1.5</leveldbjni-version>
<log4j-version>1.2.17</log4j-version>
<lucene-bundle-version>3.6.0_1</lucene-bundle-version> <!-- FIXME cmueller: not in sync! -->
<lucene-version>3.6.1</lucene-version>