Return-Path: Delivered-To: apmail-directory-commits-archive@www.apache.org Received: (qmail 75032 invoked from network); 4 Jun 2010 07:51:22 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 4 Jun 2010 07:51:22 -0000 Received: (qmail 44598 invoked by uid 500); 4 Jun 2010 07:51:22 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 44528 invoked by uid 500); 4 Jun 2010 07:51:20 -0000 Mailing-List: contact commits-help@directory.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@directory.apache.org Delivered-To: mailing list commits@directory.apache.org Received: (qmail 44519 invoked by uid 99); 4 Jun 2010 07:51:19 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 04 Jun 2010 07:51:19 +0000 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; Fri, 04 Jun 2010 07:51:17 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 6FBCB2388980; Fri, 4 Jun 2010 07:50:56 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r951314 - /directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/util/StringTools.java Date: Fri, 04 Jun 2010 07:50:56 -0000 To: commits@directory.apache.org From: felixk@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100604075056.6FBCB2388980@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: felixk Date: Fri Jun 4 07:50:56 2010 New Revision: 951314 URL: http://svn.apache.org/viewvc?rev=951314&view=rev Log: Don't catch RuntimeExceptions accidentally Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/util/StringTools.java Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/util/StringTools.java URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/util/StringTools.java?rev=951314&r1=951313&r2=951314&view=diff ============================================================================== --- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/util/StringTools.java (original) +++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/util/StringTools.java Fri Jun 4 07:50:56 2010 @@ -25,6 +25,7 @@ import java.io.File; import java.io.FileFilter; import java.io.OutputStreamWriter; import java.io.UnsupportedEncodingException; +import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; import java.nio.charset.Charset; import java.util.ArrayList; @@ -3345,7 +3346,17 @@ public class StringTools Method method = Charset.class.getMethod( "defaultCharset", new Class[0] ); defaultCharset = ((Charset) method.invoke( null, new Object[0]) ).name(); } - catch (Exception e) + catch (NoSuchMethodException e) + { + // fall back to old method + defaultCharset = new OutputStreamWriter( new ByteArrayOutputStream() ).getEncoding(); + } + catch (InvocationTargetException e) + { + // fall back to old method + defaultCharset = new OutputStreamWriter( new ByteArrayOutputStream() ).getEncoding(); + } + catch (IllegalAccessException e) { // fall back to old method defaultCharset = new OutputStreamWriter( new ByteArrayOutputStream() ).getEncoding();