diff options
| -rw-r--r-- | libjava/ChangeLog | 4 | ||||
| -rw-r--r-- | libjava/java/security/Security.java | 43 |
2 files changed, 27 insertions, 20 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index c70777de26d..8d4b6ab7198 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,5 +1,9 @@ 2003-10-08 Michael Koch <konqueror@gmx.de> + * java/security/Security.java: Reformated. + +2003-10-08 Michael Koch <konqueror@gmx.de> + * java/text/SimpleDateFormat.java (compileFormat): Replace Character.isLetter() test with Character.isLowerCase() || Character.isUpperCase(). diff --git a/libjava/java/security/Security.java b/libjava/java/security/Security.java index 56335bf85c3..350c04f101f 100644 --- a/libjava/java/security/Security.java +++ b/libjava/java/security/Security.java @@ -65,32 +65,35 @@ public final class Security extends Object private static Vector providers = new Vector(); private static Properties secprops = new Properties(); + static - { - String base = System.getProperty("gnu.classpath.home.url"); - String vendor = System.getProperty("gnu.classpath.vm.shortname"); + { + String base = System.getProperty ("gnu.classpath.home.url"); + String vendor = System.getProperty ("gnu.classpath.vm.shortname"); - // Try VM specific security file - boolean loaded = loadProviders(base, vendor); + // Try VM specific security file + boolean loaded = loadProviders (base, vendor); - // Append classpath standard provider if possible - if (!loadProviders(base, "classpath") && !loaded && providers.size() == 0) - { - // No providers found and both security files failed to load properly. - System.err.println - ("WARNING: could not properly read security provider files:"); - System.err.println - (" " + base + "/security/" + vendor + ".security"); - System.err.println - (" " + base + "/security/" + "classpath" + ".security"); - System.err.println - (" Falling back to standard GNU security provider"); - providers.addElement(new gnu.java.security.provider.Gnu()); - } + // Append classpath standard provider if possible + if (!loadProviders (base, "classpath") + && !loaded + && providers.size() == 0) + { + // No providers found and both security files failed to load properly. + System.err.println + ("WARNING: could not properly read security provider files:"); + System.err.println + (" " + base + "/security/" + vendor + ".security"); + System.err.println + (" " + base + "/security/" + "classpath" + ".security"); + System.err.println + (" Falling back to standard GNU security provider"); + providers.addElement (new gnu.java.security.provider.Gnu()); + } } // This class can't be instantiated. - private Security () + private Security() { } |