Return-Path: X-Original-To: apmail-camel-commits-archive@www.apache.org Delivered-To: apmail-camel-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 201F6E455 for ; Thu, 24 Jan 2013 16:44:28 +0000 (UTC) Received: (qmail 67144 invoked by uid 500); 24 Jan 2013 16:44:27 -0000 Delivered-To: apmail-camel-commits-archive@camel.apache.org Received: (qmail 67075 invoked by uid 500); 24 Jan 2013 16:44:27 -0000 Mailing-List: contact commits-help@camel.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@camel.apache.org Delivered-To: mailing list commits@camel.apache.org Received: (qmail 67063 invoked by uid 99); 24 Jan 2013 16:44:27 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 24 Jan 2013 16:44:27 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 24 Jan 2013 16:44:25 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id BEF57238896F; Thu, 24 Jan 2013 16:44:06 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: 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 Date: Thu, 24 Jan 2013 16:44:06 -0000 To: commits@camel.apache.org From: davsclaus@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20130124164406.BEF57238896F@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org 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 @@ 2.3.0 0.4.8 2.3.0_2 - 1.3 + 1.5 1.2.17 3.6.0_1 3.6.1