diff options
Diffstat (limited to 'libjava/java')
| -rw-r--r-- | libjava/java/nio/charset/Charset.java | 25 |
1 files changed, 16 insertions, 9 deletions
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(); } |
