diff options
| author | Andreas Tobler <a.tobler@schweiz.ch> | 2004-11-16 22:31:55 +0100 |
|---|---|---|
| committer | Andreas Tobler <andreast@gcc.gnu.org> | 2004-11-16 22:31:55 +0100 |
| commit | fd9065b2ef6a6d36c98b0a2a1db25a0dfc9180ce (patch) | |
| tree | 5293daa3ade2dca5b8b310eb205ac6720043cfd7 /libjava | |
| parent | d281a1f1bd19c6a8b0f363649f426c945ee8a9ce (diff) | |
| download | gcc-fd9065b2ef6a6d36c98b0a2a1db25a0dfc9180ce.zip gcc-fd9065b2ef6a6d36c98b0a2a1db25a0dfc9180ce.tar.gz gcc-fd9065b2ef6a6d36c98b0a2a1db25a0dfc9180ce.tar.bz2 | |
Security.java (Security): Silence the warning about no providers found in the no debug case.
2004-11-16 Andreas Tobler <a.tobler@schweiz.ch>
* java/security/Security.java (Security): Silence the warning about no
providers found in the no debug case.
From-SVN: r90765
Diffstat (limited to 'libjava')
| -rw-r--r-- | libjava/ChangeLog | 5 | ||||
| -rw-r--r-- | libjava/java/security/Security.java | 37 |
2 files changed, 28 insertions, 14 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 7a6759d..1f649b3 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,8 @@ +2004-11-16 Andreas Tobler <a.tobler@schweiz.ch> + + * java/security/Security.java (Security): Silence the warning about no + providers found in the no debug case. + 2004-11-16 Michael Koch <konqueror@gmx.de> * java/net/InetAddress.java diff --git a/libjava/java/security/Security.java b/libjava/java/security/Security.java index 1820319..01c0a05 100644 --- a/libjava/java/security/Security.java +++ b/libjava/java/security/Security.java @@ -40,6 +40,8 @@ package java.security; import gnu.java.security.action.GetPropertyAction; +import gnu.classpath.Configuration; + import java.io.IOException; import java.io.InputStream; import java.net.URL; @@ -81,20 +83,27 @@ public final class Security 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()); - } - } - + { + if (Configuration.DEBUG) + { + /* No providers found and both security files failed to + * load properly. Give a warning in case of DEBUG is + * enabled. Could be done with java.util.logging later. + */ + 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() { |