Only initialise loggers when Configuration.DEBUG is true.

Avoid floating point arithmetic when computing 1.5 * length.
Cast instance generated by reflection to correct type.
Remove redundant super() calls and initialisations.
Drop unused variable.

2010-05-09  Ivan Maidanski  <ivmai@mail.ru>

	* gnu/java/security/Properties.java: Only
	initialise log if Configuration.DEBUG is true.
	* gnu/java/security/der/DERWriter.java:
	(toUtf8(String)): Calculate 1.5 * len using
	len + (len >> 1) to avoid multiplication by a floating-point
	number.
	* gnu/java/security/hash/Whirlpool.java: Only
	initialise log if Configuration.DEBUG is true.
	* gnu/java/security/jce/sig/EncodedKeyFactory.java: Likewise.
	* gnu/java/security/jce/sig/SignatureAdapter.java: Likewise.
	* gnu/java/security/key/dss/DSSKeyPairGenerator.java: Likewise.
	* gnu/java/security/key/dss/DSSKeyPairPKCS8Codec.java: Likewise.
	* gnu/java/security/key/rsa/RSAKeyPairGenerator.java: Likewise.
	* gnu/java/security/key/rsa/RSAKeyPairPKCS8Codec.java: Likewise.
	* gnu/java/security/key/rsa/RSAKeyPairX509Codec.java: Likewise.
	* gnu/java/security/pkcs/PKCS7SignedData.java: Likewise.
	* gnu/java/security/pkcs/SignerInfo.java: Likewise.
	(SignerInfo(BERReader)): Only print version if Configuration.DEBUG is
	true, as with other output.
	* gnu/java/security/provider/PKIXCertPathValidatorImpl.java:
	Only initialise log if Configuration.DEBUG is true.
	* gnu/java/security/sig/rsa/EMSA_PSS.java: Likewise.
	* gnu/java/security/sig/rsa/RSAPSSSignature.java: Likewise.
	* gnu/java/security/x509/X509CRL.java: Likewise.
	* gnu/java/security/x509/X509CRLEntry.java: Likewise.
	* gnu/java/security/x509/ext/Extension.java: Likewise.
	* gnu/javax/crypto/cipher/Anubis.java: Likewise.
	* gnu/javax/crypto/cipher/BaseCipher.java: Likewise.
	* gnu/javax/crypto/cipher/Khazad.java: Likewise.
	* gnu/javax/crypto/cipher/Rijndael.java: Likewise.
	* gnu/javax/crypto/cipher/Twofish.java: Likewise.
	* gnu/javax/crypto/jce/cipher/KeyWrappingAlgorithmAdapter.java: Likewise.
	* gnu/javax/crypto/jce/keyring/GnuKeyring.java: Likewise.
	* gnu/javax/crypto/jce/params/BlockCipherParameters.java: Likewise.
	* gnu/javax/crypto/jce/prng/ICMRandomSpi.java: Likewise.
	* gnu/javax/crypto/jce/prng/UMacRandomSpi.java: Likewise.
	* gnu/javax/crypto/key/dh/GnuDHKeyPairGenerator.java: Likewise.
	(sha): Drop unused variable.
	(rnd): Use implicit initialisation to null as with other variables.
	* gnu/javax/crypto/key/srp6/SRPKeyPairGenerator.java:
	Only initialise log if Configuration.DEBUG is true.
	* gnu/javax/crypto/keyring/Entry.java: Likewise.
	* gnu/javax/crypto/keyring/EnvelopeEntry.java: Likewise.
	* gnu/javax/crypto/keyring/GnuPublicKeyring.java: Likewise.
	* gnu/javax/crypto/mac/OMAC.java: Likewise.
	* gnu/javax/crypto/pad/BasePad.java: Likewise.
	* gnu/javax/crypto/pad/PKCS1_V1_5.java: Likewise.
	* gnu/javax/crypto/pad/PKCS7.java: Likewise.
	* gnu/javax/crypto/pad/TBC.java: Likewise.
	* gnu/javax/crypto/prng/CSPRNG.java: Likewise.
	(getSystemInstance()): Clarify bracketing of for loop
	and ignorance of exceptions in the OTHER case.
	* gnu/javax/crypto/sasl/SaslInputStream.java:
	Only initialise log if Configuration.DEBUG is true.
	* gnu/javax/crypto/sasl/SaslOutputStream.java: Likewise.
	* gnu/javax/crypto/sasl/srp/SRPClient.java: Likewise.
	* gnu/javax/crypto/sasl/srp/SRPServer.java: Likewise.
	* gnu/javax/security/auth/login/ConfigFileParser.java: Likewise.
	(map): Make final.
	* gnu/javax/security/auth/login/ConfigFileTokenizer.java:
	Only initialise log if Configuration.DEBUG is true.
	(br): Make final.
	(ConfigFileTokenizer(Reader)): Remove explicit initialisation of
	initialised and call to superclass when superclass is Object.
	* gnu/javax/security/auth/login/GnuConfiguration.java:
	Only iniialise log if Configuration.DEBUG is true.
	* java/math/BigInteger.java: Likewise.

5 files changed, 18 insertions, 10 deletions

diff --git a/gnu/java/security/key/dss/DSSKeyPairGenerator.java b/gnu/java/security/key/dss/DSSKeyPairGenerator.java
index 6bda4e88e..70df734a9 100644
--- a/gnu/java/security/key/dss/DSSKeyPairGenerator.java
+++ b/gnu/java/security/key/dss/DSSKeyPairGenerator.java
@@ -1,5 +1,5 @@
 /* DSSKeyPairGenerator.java --
-   Copyright 2001, 2002, 2003, 2006 Free Software Foundation, Inc.
+   Copyright 2001, 2002, 2003, 2006, 2010 Free Software Foundation, Inc.
 
 This file is a part of GNU Classpath.
 
@@ -66,7 +66,8 @@ import java.util.logging.Logger;
 public class DSSKeyPairGenerator
     implements IKeyPairGenerator
 {
-  private static final Logger log = Logger.getLogger(DSSKeyPairGenerator.class.getName());
+  private static final Logger log = Configuration.DEBUG ?
+                Logger.getLogger(DSSKeyPairGenerator.class.getName()) : null;
 
   /** The BigInteger constant 2. */
   private static final BigInteger TWO = BigInteger.valueOf(2L);
diff --git a/gnu/java/security/key/dss/DSSKeyPairPKCS8Codec.java b/gnu/java/security/key/dss/DSSKeyPairPKCS8Codec.java
index a59ca3cee..1806ecf58 100644
--- a/gnu/java/security/key/dss/DSSKeyPairPKCS8Codec.java
+++ b/gnu/java/security/key/dss/DSSKeyPairPKCS8Codec.java
@@ -1,5 +1,5 @@
 /* DSSKeyPairPKCS8Codec.java -- PKCS#8 Encoding/Decoding handler
-   Copyright (C) 2006 Free Software Foundation, Inc.
+   Copyright (C) 2006, 2010  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -67,7 +67,9 @@ import java.util.logging.Logger;
 public class DSSKeyPairPKCS8Codec
     implements IKeyPairCodec
 {
-  private static final Logger log = Logger.getLogger(DSSKeyPairPKCS8Codec.class.getName());
+  private static final Logger log = Configuration.DEBUG ?
+                Logger.getLogger(DSSKeyPairPKCS8Codec.class.getName()) : null;
+
   private static final OID DSA_ALG_OID = new OID(Registry.DSA_OID_STRING);
 
   // implicit 0-arguments constructor
diff --git a/gnu/java/security/key/rsa/RSAKeyPairGenerator.java b/gnu/java/security/key/rsa/RSAKeyPairGenerator.java
index bec60d350..99c313944 100644
--- a/gnu/java/security/key/rsa/RSAKeyPairGenerator.java
+++ b/gnu/java/security/key/rsa/RSAKeyPairGenerator.java
@@ -1,5 +1,5 @@
 /* RSAKeyPairGenerator.java --
-   Copyright 2001, 2002, 2003, 2006 Free Software Foundation, Inc.
+   Copyright 2001, 2002, 2003, 2006, 2010 Free Software Foundation, Inc.
 
 This file is a part of GNU Classpath.
 
@@ -70,7 +70,8 @@ import java.util.logging.Logger;
 public class RSAKeyPairGenerator
     implements IKeyPairGenerator
 {
-  private static final Logger log = Logger.getLogger(RSAKeyPairGenerator.class.getName());
+  private static final Logger log = Configuration.DEBUG ?
+                Logger.getLogger(RSAKeyPairGenerator.class.getName()) : null;
 
   /** The BigInteger constant 1. */
   private static final BigInteger ONE = BigInteger.ONE;
diff --git a/gnu/java/security/key/rsa/RSAKeyPairPKCS8Codec.java b/gnu/java/security/key/rsa/RSAKeyPairPKCS8Codec.java
index 2785f02c8..b07ed667c 100644
--- a/gnu/java/security/key/rsa/RSAKeyPairPKCS8Codec.java
+++ b/gnu/java/security/key/rsa/RSAKeyPairPKCS8Codec.java
@@ -1,5 +1,5 @@
 /* RSAKeyPairPKCS8Codec.java -- PKCS#8 Encoding/Decoding handler
-   Copyright (C) 2006 Free Software Foundation, Inc.
+   Copyright (C) 2006, 2010  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -64,7 +64,9 @@ import java.util.logging.Logger;
 public class RSAKeyPairPKCS8Codec
     implements IKeyPairCodec
 {
-  private static final Logger log = Logger.getLogger(RSAKeyPairPKCS8Codec.class.getName());
+  private static final Logger log = Configuration.DEBUG ?
+                Logger.getLogger(RSAKeyPairPKCS8Codec.class.getName()) : null;
+
   private static final OID RSA_ALG_OID = new OID(Registry.RSA_OID_STRING);
 
   // implicit 0-arguments constructor
diff --git a/gnu/java/security/key/rsa/RSAKeyPairX509Codec.java b/gnu/java/security/key/rsa/RSAKeyPairX509Codec.java
index 9ad6ae029..36fd75c98 100644
--- a/gnu/java/security/key/rsa/RSAKeyPairX509Codec.java
+++ b/gnu/java/security/key/rsa/RSAKeyPairX509Codec.java
@@ -1,5 +1,5 @@
 /* RSAKeyPairX509Codec.java -- X.509 Encoding/Decoding handler
-   Copyright (C) 2006 Free Software Foundation, Inc.
+   Copyright (C) 2006, 2010  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -65,7 +65,9 @@ import java.util.logging.Logger;
 public class RSAKeyPairX509Codec
     implements IKeyPairCodec
 {
-  private static final Logger log = Logger.getLogger(RSAKeyPairX509Codec.class.getName());
+  private static final Logger log = Configuration.DEBUG ?
+                Logger.getLogger(RSAKeyPairX509Codec.class.getName()) : null;
+
   private static final OID RSA_ALG_OID = new OID(Registry.RSA_OID_STRING);
 
   // implicit 0-arguments constructor