2 files changed, 6 insertions, 4 deletions
diff --git a/libjava/classpath/gnu/java/security/sig/rsa/EMSA_PSS.java b/libjava/classpath/gnu/java/security/sig/rsa/EMSA_PSS.java
index 917d9632334..7a8e591a376 100644
--- a/libjava/classpath/gnu/java/security/sig/rsa/EMSA_PSS.java
+++ b/libjava/classpath/gnu/java/security/sig/rsa/EMSA_PSS.java
@@ -1,5 +1,5 @@
 /* EMSA_PSS.java --
-   Copyright (C) 2001, 2002, 2003, 2006 Free Software Foundation, Inc.
+   Copyright (C) 2001, 2002, 2003, 2006, 2010 Free Software Foundation, Inc.
 
 This file is a part of GNU Classpath.
 
@@ -73,7 +73,8 @@ import java.util.logging.Logger;
 public class EMSA_PSS
     implements Cloneable
 {
-  private static final Logger log = Logger.getLogger(EMSA_PSS.class.getName());
+  private static final Logger log = Configuration.DEBUG ?
+                        Logger.getLogger(EMSA_PSS.class.getName()) : null;
 
   /** The underlying hash function to use with this instance. */
   private IMessageDigest hash;
diff --git a/libjava/classpath/gnu/java/security/sig/rsa/RSAPSSSignature.java b/libjava/classpath/gnu/java/security/sig/rsa/RSAPSSSignature.java
index d8f8327f1cf..7b042f77f27 100644
--- a/libjava/classpath/gnu/java/security/sig/rsa/RSAPSSSignature.java
+++ b/libjava/classpath/gnu/java/security/sig/rsa/RSAPSSSignature.java
@@ -1,5 +1,5 @@
 /* RSAPSSSignature.java --
-   Copyright (C) 2001, 2002, 2003, 2006 Free Software Foundation, Inc.
+   Copyright (C) 2001, 2002, 2003, 2006, 2010 Free Software Foundation, Inc.
 
 This file is a part of GNU Classpath.
 
@@ -75,7 +75,8 @@ import java.util.logging.Logger;
 public class RSAPSSSignature
     extends BaseSignature
 {
-  private static final Logger log = Logger.getLogger(RSAPSSSignature.class.getName());
+  private static final Logger log = Configuration.DEBUG ?
+                Logger.getLogger(RSAPSSSignature.class.getName()) : null;
 
   /** The underlying EMSA-PSS instance for this object. */
   private EMSA_PSS pss;