Return-Path: X-Original-To: apmail-lucene-commits-archive@www.apache.org Delivered-To: apmail-lucene-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 49CB2ED2D for ; Wed, 2 Jan 2013 12:07:11 +0000 (UTC) Received: (qmail 74153 invoked by uid 500); 2 Jan 2013 12:07:11 -0000 Mailing-List: contact commits-help@lucene.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@lucene.apache.org Delivered-To: mailing list commits@lucene.apache.org Received: (qmail 74136 invoked by uid 99); 2 Jan 2013 12:07:10 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 02 Jan 2013 12:07:10 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 02 Jan 2013 12:07:09 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id E0DF6238890D; Wed, 2 Jan 2013 12:06:49 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: svn commit: r1427755 - in /lucene/dev/trunk/solr: CHANGES.txt contrib/clustering/src/java/org/apache/solr/handler/clustering/carrot2/CarrotClusteringEngine.java Date: Wed, 02 Jan 2013 12:06:49 -0000 To: commits@lucene.apache.org From: stanislaw@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20130102120649.E0DF6238890D@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org 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); }