2005-04-29 Michael Koch <konqueror@gmx.de>

	* java/nio/charset/Charset.java
	(provider): Reformatted.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@98978 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 7a78f4d..db83c3d 100644 (file)
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,5 +1,10 @@
 2005-04-29  Michael Koch  <konqueror@gmx.de>
 
+       * java/nio/charset/Charset.java
+       (provider): Reformatted.
+
+2005-04-29  Michael Koch  <konqueror@gmx.de>
+
        * gnu/java/net/protocol/http/HTTPConnection.java:
        (userAgent): Initialize from system properties.
        (initUserAgent): Removed.

diff --git a/libjava/java/nio/charset/Charset.java b/libjava/java/nio/charset/Charset.java
index 703d023..d52fc9c 100644 (file)
--- 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();
   }