Merge GNU Classpath 0.99 into libjava.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@185741 138bc75d-0d04-0410-961f-82ee72b054a4

1 files changed, 3 insertions, 2 deletions

diff --git a/libjava/classpath/gnu/javax/crypto/sasl/SaslInputStream.java b/libjava/classpath/gnu/javax/crypto/sasl/SaslInputStream.java
index 6a6c8575115..e505d4525bb 100644
--- a/libjava/classpath/gnu/javax/crypto/sasl/SaslInputStream.java
+++ b/libjava/classpath/gnu/javax/crypto/sasl/SaslInputStream.java
@@ -1,5 +1,5 @@
 /* SaslInputStream.java --
-   Copyright (C) 2003, 2006 Free Software Foundation, Inc.
+   Copyright (C) 2003, 2006, 2010 Free Software Foundation, Inc.
 
 This file is a part of GNU Classpath.
 
@@ -57,7 +57,8 @@ import javax.security.sasl.SaslServer;
 public class SaslInputStream
     extends InputStream
 {
-  private static final Logger log = Logger.getLogger(SaslInputStream.class.getName());
+  private static final Logger log = Configuration.DEBUG ?
+                Logger.getLogger(SaslInputStream.class.getName()) : null;
   private SaslClient client;
   private SaslServer server;
   private int maxRawSendSize;