You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ni...@apache.org on 2012/12/05 10:29:56 UTC
svn commit: r1417330 -
/camel/trunk/components/camel-mongodb/src/main/java/org/apache/camel/component/mongodb/converters/MongoDbBasicConverters.java
Author: ningjiang
Date: Wed Dec 5 09:29:56 2012
New Revision: 1417330
URL: http://svn.apache.org/viewvc?rev=1417330&view=rev
Log:
CAMEL-5847 make sure the FileInputStream is closed at the end.
Modified:
camel/trunk/components/camel-mongodb/src/main/java/org/apache/camel/component/mongodb/converters/MongoDbBasicConverters.java
Modified: camel/trunk/components/camel-mongodb/src/main/java/org/apache/camel/component/mongodb/converters/MongoDbBasicConverters.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-mongodb/src/main/java/org/apache/camel/component/mongodb/converters/MongoDbBasicConverters.java?rev=1417330&r1=1417329&r2=1417330&view=diff
==============================================================================
--- camel/trunk/components/camel-mongodb/src/main/java/org/apache/camel/component/mongodb/converters/MongoDbBasicConverters.java (original)
+++ camel/trunk/components/camel-mongodb/src/main/java/org/apache/camel/component/mongodb/converters/MongoDbBasicConverters.java Wed Dec 5 09:29:56 2012
@@ -19,6 +19,7 @@ package org.apache.camel.component.mongo
import java.io.File;
import java.io.FileInputStream;
import java.io.FileNotFoundException;
+import java.io.IOException;
import java.io.InputStream;
import java.util.Map;
@@ -30,6 +31,7 @@ import com.mongodb.util.JSONCallback;
import org.apache.camel.Converter;
import org.apache.camel.Exchange;
import org.apache.camel.converter.IOConverter;
+import org.apache.camel.util.IOHelper;
import org.bson.BSONCallback;
import org.bson.BasicBSONDecoder;
import org.codehaus.jackson.map.ObjectMapper;
@@ -89,8 +91,10 @@ public final class MongoDbBasicConverter
}
} catch (Exception e) {
LOG.warn("String -> DBObject conversion selected, but the following exception occurred. Returning null.", e);
+ } finally {
+ // we need to make sure to close the input stream
+ IOHelper.close(is, "InputStream", LOG);
}
-
return answer;
}