From ed09a998b68a08600409ff9576d59e1fa8838794 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stanis=C5=82aw=20Osi=C5=84ski?= Date: Wed, 2 Jan 2013 12:06:49 +0000 Subject: [PATCH] SOLR-4253: Misleading resource loading warning from Carrot2 clustering component fixed git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1427755 13f79535-47bb-0310-9956-ffa450edef68 --- solr/CHANGES.txt | 4 ++++ .../handler/clustering/carrot2/CarrotClusteringEngine.java | 5 +---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt index 7a9ae34e47b..689860c356c 100644 --- a/solr/CHANGES.txt +++ b/solr/CHANGES.txt @@ -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 ---------------------- diff --git a/solr/contrib/clustering/src/java/org/apache/solr/handler/clustering/carrot2/CarrotClusteringEngine.java b/solr/contrib/clustering/src/java/org/apache/solr/handler/clustering/carrot2/CarrotClusteringEngine.java index 84665357f1c..396f63b4691 100644 --- a/solr/contrib/clustering/src/java/org/apache/solr/handler/clustering/carrot2/CarrotClusteringEngine.java +++ b/solr/contrib/clustering/src/java/org/apache/solr/handler/clustering/carrot2/CarrotClusteringEngine.java @@ -132,13 +132,10 @@ public class CarrotClusteringEngine extends SearchClusteringEngine { 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); }