diff options
| author | gandalf <gandalf@138bc75d-0d04-0410-961f-82ee72b054a4> | 2012-03-23 15:19:26 +0000 |
|---|---|---|
| committer | gandalf <gandalf@138bc75d-0d04-0410-961f-82ee72b054a4> | 2012-03-23 15:19:26 +0000 |
| commit | 5c7411981584e487ac41794feb98a66df9fd6fcb (patch) | |
| tree | febe3d4d4c0c994db223fee8e819bde6582494c9 /libjava/classpath/gnu/javax/crypto/sasl | |
| parent | 112dfe9f689af01c2dd00e0f153fc25d69095b6c (diff) | |
| download | ppe42-gcc-5c7411981584e487ac41794feb98a66df9fd6fcb.tar.gz ppe42-gcc-5c7411981584e487ac41794feb98a66df9fd6fcb.zip | |
Merge GNU Classpath 0.99 into libjava.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@185741 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava/classpath/gnu/javax/crypto/sasl')
4 files changed, 12 insertions, 8 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; diff --git a/libjava/classpath/gnu/javax/crypto/sasl/SaslOutputStream.java b/libjava/classpath/gnu/javax/crypto/sasl/SaslOutputStream.java index 0de1ce85068..eee0ba0f9d9 100644 --- a/libjava/classpath/gnu/javax/crypto/sasl/SaslOutputStream.java +++ b/libjava/classpath/gnu/javax/crypto/sasl/SaslOutputStream.java @@ -1,5 +1,5 @@ /* SaslOutputStream.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. @@ -56,7 +56,8 @@ import javax.security.sasl.SaslServer; public class SaslOutputStream extends OutputStream { - private static final Logger log = Logger.getLogger(SaslOutputStream.class.getName()); + private static final Logger log = Configuration.DEBUG ? + Logger.getLogger(SaslOutputStream.class.getName()) : null; private SaslClient client; private SaslServer server; private int maxRawSendSize; diff --git a/libjava/classpath/gnu/javax/crypto/sasl/srp/SRPClient.java b/libjava/classpath/gnu/javax/crypto/sasl/srp/SRPClient.java index 8e44e4ead6e..c20d477c787 100644 --- a/libjava/classpath/gnu/javax/crypto/sasl/srp/SRPClient.java +++ b/libjava/classpath/gnu/javax/crypto/sasl/srp/SRPClient.java @@ -1,5 +1,5 @@ /* SRPClient.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. @@ -87,7 +87,8 @@ public class SRPClient extends ClientMechanism implements SaslClient { - private static final Logger log = Logger.getLogger(SRPClient.class.getName()); + private static final Logger log = Configuration.DEBUG ? + Logger.getLogger(SRPClient.class.getName()) : null; private String uid; // the unique key for this type of client private String U; // the authentication identity BigInteger N, g, A, B; diff --git a/libjava/classpath/gnu/javax/crypto/sasl/srp/SRPServer.java b/libjava/classpath/gnu/javax/crypto/sasl/srp/SRPServer.java index fca5c3bf338..c92ada4b353 100644 --- a/libjava/classpath/gnu/javax/crypto/sasl/srp/SRPServer.java +++ b/libjava/classpath/gnu/javax/crypto/sasl/srp/SRPServer.java @@ -1,5 +1,5 @@ /* SRPServer.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. @@ -79,7 +79,8 @@ public class SRPServer extends ServerMechanism implements SaslServer { - private static final Logger log = Logger.getLogger(SRPServer.class.getName()); + private static final Logger log = Configuration.DEBUG ? + Logger.getLogger(SRPServer.class.getName()) : null; private String U = null; // client's username private BigInteger N, g, A, B; private byte[] s; // salt |
