lucene-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From stanis...@apache.org
Subject svn commit: r1427759 - in /lucene/dev/branches/branch_4x: ./ solr/ solr/CHANGES.txt solr/contrib/ solr/contrib/clustering/src/java/org/apache/solr/handler/clustering/carrot2/CarrotClusteringEngine.java
Date Wed, 02 Jan 2013 12:10:02 GMT
Author: stanislaw
Date: Wed Jan  2 12:10:02 2013
New Revision: 1427759

URL: http://svn.apache.org/viewvc?rev=1427759&view=rev
Log:
SOLR-4253: Misleading resource loading warning from Carrot2 clustering component fixed

Modified:
    lucene/dev/branches/branch_4x/   (props changed)
    lucene/dev/branches/branch_4x/solr/   (props changed)
    lucene/dev/branches/branch_4x/solr/CHANGES.txt   (contents, props changed)
    lucene/dev/branches/branch_4x/solr/contrib/   (props changed)
    lucene/dev/branches/branch_4x/solr/contrib/clustering/src/java/org/apache/solr/handler/clustering/carrot2/CarrotClusteringEngine.java

Modified: lucene/dev/branches/branch_4x/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/CHANGES.txt?rev=1427759&r1=1427758&r2=1427759&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/CHANGES.txt (original)
+++ lucene/dev/branches/branch_4x/solr/CHANGES.txt Wed Jan  2 12:10:02 2013
@@ -403,6 +403,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/branches/branch_4x/solr/contrib/clustering/src/java/org/apache/solr/handler/clustering/carrot2/CarrotClusteringEngine.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/contrib/clustering/src/java/org/apache/solr/handler/clustering/carrot2/CarrotClusteringEngine.java?rev=1427759&r1=1427758&r2=1427759&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/contrib/clustering/src/java/org/apache/solr/handler/clustering/carrot2/CarrotClusteringEngine.java
(original)
+++ lucene/dev/branches/branch_4x/solr/contrib/clustering/src/java/org/apache/solr/handler/clustering/carrot2/CarrotClusteringEngine.java
Wed Jan  2 12:10:02 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);
       }



Mime
View raw message