You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by st...@apache.org on 2013/01/02 13:06:49 UTC
svn commit: r1427755 - in /lucene/dev/trunk/solr: CHANGES.txt
contrib/clustering/src/java/org/apache/solr/handler/clustering/carrot2/CarrotClusteringEngine.java
Author: stanislaw
Date: Wed Jan 2 12:06:49 2013
New Revision: 1427755
URL: http://svn.apache.org/viewvc?rev=1427755&view=rev
Log:
SOLR-4253: Misleading resource loading warning from Carrot2 clustering component fixed
Modified:
lucene/dev/trunk/solr/CHANGES.txt
lucene/dev/trunk/solr/contrib/clustering/src/java/org/apache/solr/handler/clustering/carrot2/CarrotClusteringEngine.java
Modified: lucene/dev/trunk/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/CHANGES.txt?rev=1427755&r1=1427754&r2=1427755&view=diff
==============================================================================
--- lucene/dev/trunk/solr/CHANGES.txt (original)
+++ lucene/dev/trunk/solr/CHANGES.txt Wed Jan 2 12:06:49 2013
@@ -426,6 +426,10 @@ Bug Fixes
* SOLR-4251: Fix SynonymFilterFactory when an optional tokenizerFactory is supplied.
(Chris Bleakley via rmuir)
+* SOLR-4253: Misleading resource loading warning from Carrot2 clustering
+ component fixed (StanisÅaw OsiÅski)
+
+
Other Changes
----------------------
Modified: lucene/dev/trunk/solr/contrib/clustering/src/java/org/apache/solr/handler/clustering/carrot2/CarrotClusteringEngine.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/contrib/clustering/src/java/org/apache/solr/handler/clustering/carrot2/CarrotClusteringEngine.java?rev=1427755&r1=1427754&r2=1427755&view=diff
==============================================================================
--- lucene/dev/trunk/solr/contrib/clustering/src/java/org/apache/solr/handler/clustering/carrot2/CarrotClusteringEngine.java (original)
+++ lucene/dev/trunk/solr/contrib/clustering/src/java/org/apache/solr/handler/clustering/carrot2/CarrotClusteringEngine.java Wed Jan 2 12:06:49 2013
@@ -132,13 +132,10 @@ public class CarrotClusteringEngine exte
try {
resourceStream = resourceLoader.openResource(resourceName);
asBytes = IOUtils.toByteArray(resourceStream);
- } catch (RuntimeException e) {
+ } catch (IOException e) {
log.debug("Resource not found in Solr's config: " + resourceName
+ ". Using the default " + resource + " from Carrot JAR.");
return new IResource[] {};
- } catch (IOException e) {
- log.warn("Could not read Solr resource " + resourceName);
- return new IResource[] {};
} finally {
if (resourceStream != null) Closeables.closeQuietly(resourceStream);
}