2 files changed, 8 insertions, 5 deletions
diff --git a/libjava/classpath/gnu/java/security/pkcs/PKCS7SignedData.java b/libjava/classpath/gnu/java/security/pkcs/PKCS7SignedData.java
index adb00a3bea0..e479d2e8caf 100644
--- a/libjava/classpath/gnu/java/security/pkcs/PKCS7SignedData.java
+++ b/libjava/classpath/gnu/java/security/pkcs/PKCS7SignedData.java
@@ -1,5 +1,5 @@
 /* PKCS7SignedData.java -- reader/writer for PKCS#7 signedData objects
-   Copyright (C) 2004, 2005, 2006  Free Software Foundation, Inc.
+   Copyright (C) 2004, 2005, 2006, 2010  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -78,7 +78,8 @@ import java.util.logging.Logger;
  */
 public class PKCS7SignedData
 {
-  private static final Logger log = Logger.getLogger(PKCS7SignedData.class.getName());
+  private static final Logger log = Configuration.DEBUG ?
+                Logger.getLogger(PKCS7SignedData.class.getName()) : null;
 
   public static final OID PKCS7_SIGNED_DATA = new OID("1.2.840.113549.1.7.2");
 
diff --git a/libjava/classpath/gnu/java/security/pkcs/SignerInfo.java b/libjava/classpath/gnu/java/security/pkcs/SignerInfo.java
index 645ed67bb14..07ce4d71b14 100644
--- a/libjava/classpath/gnu/java/security/pkcs/SignerInfo.java
+++ b/libjava/classpath/gnu/java/security/pkcs/SignerInfo.java
@@ -1,5 +1,5 @@
 /* SignerInfo.java -- a SignerInfo object, from PKCS #7
-   Copyright (C) 2004, 2005  Free Software Foundation, Inc.
+   Copyright (C) 2004, 2005, 2010  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -59,7 +59,8 @@ import javax.security.auth.x500.X500Principal;
 
 public class SignerInfo
 {
-  private static final Logger log = Logger.getLogger(SignerInfo.class.getName());
+  private static final Logger log = Configuration.DEBUG ?
+                        Logger.getLogger(SignerInfo.class.getName()) : null;
 
   private final BigInteger version;
   private final BigInteger serialNumber;
@@ -111,7 +112,8 @@ public class SignerInfo
       throw new BEREncodingException("malformed Version");
 
     version = (BigInteger) val.getValue();
-    log.fine("  Version: " + version);
+    if (Configuration.DEBUG)
+      log.fine("  Version: " + version);
 
     val = ber.read();
     if (!val.isConstructed())