From 542f0c729112a46e5f2e04864d175436859dc169 Mon Sep 17 00:00:00 2001 From: Michael Koch Date: Fri, 29 Apr 2005 06:54:47 +0000 Subject: [PATCH] 2005-04-29 Michael Koch * java/nio/charset/Charset.java (provider): Reformatted. From-SVN: r98978 --- libjava/ChangeLog | 5 +++++ libjava/java/nio/charset/Charset.java | 25 ++++++++++++++++--------- 2 files changed, 21 insertions(+), 9 deletions(-) diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 7a78f4dcee5..db83c3d3435 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,8 @@ +2005-04-29 Michael Koch + + * java/nio/charset/Charset.java + (provider): Reformatted. + 2005-04-29 Michael Koch * gnu/java/net/protocol/http/HTTPConnection.java: diff --git a/libjava/java/nio/charset/Charset.java b/libjava/java/nio/charset/Charset.java index 703d0232fbc..d52fc9c7d21 100644 --- a/libjava/java/nio/charset/Charset.java +++ b/libjava/java/nio/charset/Charset.java @@ -1,5 +1,5 @@ /* Charset.java -- - Copyright (C) 2002, 2004 Free Software Foundation, Inc. + Copyright (C) 2002, 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -185,14 +185,21 @@ public abstract class Charset implements Comparable private static CharsetProvider provider() { - try { - String s = System.getProperty("charset.provider"); - if(s != null){ - CharsetProvider p = - (CharsetProvider) ((Class.forName(s)).newInstance()); - return p; - } - } catch(Exception e){} + try + { + String s = System.getProperty("charset.provider"); + if (s != null) + { + CharsetProvider p = + (CharsetProvider) ((Class.forName(s)).newInstance()); + return p; + } + } + catch (Exception e) + { + // Ignore. + } + return Provider.provider(); } -- 2.30.2