OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

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

From-SVN: r98978
This commit is contained in:
Michael Koch 2005-04-29 06:54:47 +00:00 committed by Michael Koch
parent 2879b0203f
commit 542f0c7291
2 changed files with 21 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libjava/ChangeLog
View File

@ -1,3 +1,8 @@
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:

25
libjava/java/nio/charset/Charset.java
View File

@ -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();
}