summaryrefslogtreecommitdiffstats
path: root/libjava/classpath/gnu/javax/crypto/keyring/EnvelopeEntry.java
diff options
context:
space:
mode:
authorgandalf <gandalf@138bc75d-0d04-0410-961f-82ee72b054a4>2012-03-23 15:19:26 +0000
committergandalf <gandalf@138bc75d-0d04-0410-961f-82ee72b054a4>2012-03-23 15:19:26 +0000
commit5c7411981584e487ac41794feb98a66df9fd6fcb (patch)
treefebe3d4d4c0c994db223fee8e819bde6582494c9 /libjava/classpath/gnu/javax/crypto/keyring/EnvelopeEntry.java
parent112dfe9f689af01c2dd00e0f153fc25d69095b6c (diff)
downloadppe42-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/keyring/EnvelopeEntry.java')
-rw-r--r--libjava/classpath/gnu/javax/crypto/keyring/EnvelopeEntry.java5
1 files changed, 3 insertions, 2 deletions
diff --git a/libjava/classpath/gnu/javax/crypto/keyring/EnvelopeEntry.java b/libjava/classpath/gnu/javax/crypto/keyring/EnvelopeEntry.java
index 76aba7d7b10..faaa7a808ea 100644
--- a/libjava/classpath/gnu/javax/crypto/keyring/EnvelopeEntry.java
+++ b/libjava/classpath/gnu/javax/crypto/keyring/EnvelopeEntry.java
@@ -1,5 +1,5 @@
/* EnvelopeEntry.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.
@@ -58,7 +58,8 @@ import java.util.logging.Logger;
public abstract class EnvelopeEntry
extends Entry
{
- private static final Logger log = Logger.getLogger(EnvelopeEntry.class.getName());
+ private static final Logger log = Configuration.DEBUG ?
+ Logger.getLogger(EnvelopeEntry.class.getName()) : null;
/** The envelope that contains this one (if any). */
protected EnvelopeEntry containingEnvelope;
/** The contained entries. */
OpenPOWER on IntegriCloud