You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by us...@apache.org on 2012/08/16 23:58:24 UTC
svn commit: r1374081 - in /lucene/dev/branches/branch_4x: ./ solr/
solr/solrj/
solr/solrj/src/java/org/apache/solr/common/util/ContentStreamBase.java
Author: uschindler
Date: Thu Aug 16 21:58:23 2012
New Revision: 1374081
URL: http://svn.apache.org/viewvc?rev=1374081&view=rev
Log:
Merged revision(s) 1374079 from lucene/dev/trunk:
Don't use IOUtils in SolrJ! Sorry, hope maven build did not start in this time frame *g*
Modified:
lucene/dev/branches/branch_4x/ (props changed)
lucene/dev/branches/branch_4x/solr/ (props changed)
lucene/dev/branches/branch_4x/solr/solrj/ (props changed)
lucene/dev/branches/branch_4x/solr/solrj/src/java/org/apache/solr/common/util/ContentStreamBase.java
Modified: lucene/dev/branches/branch_4x/solr/solrj/src/java/org/apache/solr/common/util/ContentStreamBase.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/solrj/src/java/org/apache/solr/common/util/ContentStreamBase.java?rev=1374081&r1=1374080&r2=1374081&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/solrj/src/java/org/apache/solr/common/util/ContentStreamBase.java (original)
+++ lucene/dev/branches/branch_4x/solr/solrj/src/java/org/apache/solr/common/util/ContentStreamBase.java Thu Aug 16 21:58:23 2012
@@ -29,8 +29,6 @@ import java.net.URL;
import java.net.URLConnection;
import java.util.Locale;
-import org.apache.lucene.util.IOUtils;
-
/**
* Three concrete implementations for ContentStream - one for File/URL/String
*
@@ -120,7 +118,9 @@ public abstract class ContentStreamBase
}
} catch(Exception ex) {
} finally {
- IOUtils.closeWhileHandlingException(stream);
+ if (stream != null) try {
+ stream.close();
+ } catch (IOException ioe) {}
}
}
return contentType;