Return-Path: Delivered-To: apmail-jackrabbit-commits-archive@www.apache.org Received: (qmail 34435 invoked from network); 25 Nov 2008 16:39:06 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 25 Nov 2008 16:39:06 -0000 Received: (qmail 93785 invoked by uid 500); 25 Nov 2008 16:39:16 -0000 Delivered-To: apmail-jackrabbit-commits-archive@jackrabbit.apache.org Received: (qmail 93758 invoked by uid 500); 25 Nov 2008 16:39:16 -0000 Mailing-List: contact commits-help@jackrabbit.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@jackrabbit.apache.org Delivered-To: mailing list commits@jackrabbit.apache.org Received: (qmail 93749 invoked by uid 99); 25 Nov 2008 16:39:16 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 25 Nov 2008 08:39:16 -0800 X-ASF-Spam-Status: No, hits=-2000.0 required=10.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; Tue, 25 Nov 2008 16:37:59 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 264942388879; Tue, 25 Nov 2008 08:38:15 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r720533 - in /jackrabbit/trunk/jackrabbit-text-extractors/src: main/java/org/apache/jackrabbit/extractor/RTFTextExtractor.java test/java/org/apache/jackrabbit/extractor/RTFTextExtractorTest.java Date: Tue, 25 Nov 2008 16:38:14 -0000 To: commits@jackrabbit.apache.org From: jukka@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20081125163815.264942388879@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: jukka Date: Tue Nov 25 08:38:14 2008 New Revision: 720533 URL: http://svn.apache.org/viewvc?rev=720533&view=rev Log: JCR-1881: RTF text extractor fails on Java 1.4 in some environments Catch and log all errors in RTFTextExtractor. Guard the test case against unhelpful environments. Modified: jackrabbit/trunk/jackrabbit-text-extractors/src/main/java/org/apache/jackrabbit/extractor/RTFTextExtractor.java jackrabbit/trunk/jackrabbit-text-extractors/src/test/java/org/apache/jackrabbit/extractor/RTFTextExtractorTest.java Modified: jackrabbit/trunk/jackrabbit-text-extractors/src/main/java/org/apache/jackrabbit/extractor/RTFTextExtractor.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-text-extractors/src/main/java/org/apache/jackrabbit/extractor/RTFTextExtractor.java?rev=720533&r1=720532&r2=720533&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-text-extractors/src/main/java/org/apache/jackrabbit/extractor/RTFTextExtractor.java (original) +++ jackrabbit/trunk/jackrabbit-text-extractors/src/main/java/org/apache/jackrabbit/extractor/RTFTextExtractor.java Tue Nov 25 08:38:14 2008 @@ -61,8 +61,8 @@ rek.read(stream, doc, 0); String text = doc.getText(0, doc.getLength()); return new StringReader(text); - } catch (BadLocationException e) { - logger.warn("Failed to extract RTF text content", e); + } catch (Throwable t) { + logger.warn("Failed to extract RTF text content", t); return new StringReader(""); } finally { stream.close(); Modified: jackrabbit/trunk/jackrabbit-text-extractors/src/test/java/org/apache/jackrabbit/extractor/RTFTextExtractorTest.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-text-extractors/src/test/java/org/apache/jackrabbit/extractor/RTFTextExtractorTest.java?rev=720533&r1=720532&r2=720533&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-text-extractors/src/test/java/org/apache/jackrabbit/extractor/RTFTextExtractorTest.java (original) +++ jackrabbit/trunk/jackrabbit-text-extractors/src/test/java/org/apache/jackrabbit/extractor/RTFTextExtractorTest.java Tue Nov 25 08:38:14 2008 @@ -21,6 +21,8 @@ import java.io.Reader; import java.io.StringWriter; +import javax.swing.text.DefaultStyledDocument; + import junit.framework.TestCase; /** @@ -30,6 +32,13 @@ public class RTFTextExtractorTest extends TestCase { public void testExtractor() throws IOException { + // JCR-1881: Only run the test if the underlying libraries work + try { + new DefaultStyledDocument(); + } catch (Throwable t) { + return; + } + TextExtractor extractor = new RTFTextExtractor(); InputStream in = getClass().getResourceAsStream("test.rtf"); Reader r = extractor.extractText(in, "application/rtf", null);