Merge GNU Classpath 0.99 into libjava.

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

3 files changed, 14 insertions, 11 deletions

diff --git a/libjava/classpath/gnu/javax/security/auth/login/ConfigFileParser.java b/libjava/classpath/gnu/javax/security/auth/login/ConfigFileParser.java
index 5c4c4261f5f..bebd036f986 100644
--- a/libjava/classpath/gnu/javax/security/auth/login/ConfigFileParser.java
+++ b/libjava/classpath/gnu/javax/security/auth/login/ConfigFileParser.java
@@ -1,5 +1,5 @@
 /* ConfigFileParser.java -- JAAS Login Configuration default syntax parser
-   Copyright (C) 2006 Free Software Foundation, Inc.
+   Copyright (C) 2006, 2010  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -91,9 +91,11 @@ import javax.security.auth.login.AppConfigurationEntry;
  */
 public final class ConfigFileParser
 {
-  private static final Logger log = Logger.getLogger(ConfigFileParser.class.getName());
+  private static final Logger log = Configuration.DEBUG ?
+                Logger.getLogger(ConfigFileParser.class.getName()) : null;
+
   private ConfigFileTokenizer cft;
-  private Map map = new HashMap();
+  private final Map map = new HashMap();
 
   // default 0-arguments constructor
 
diff --git a/libjava/classpath/gnu/javax/security/auth/login/ConfigFileTokenizer.java b/libjava/classpath/gnu/javax/security/auth/login/ConfigFileTokenizer.java
index fc35bf77213..f120f4e60ac 100644
--- a/libjava/classpath/gnu/javax/security/auth/login/ConfigFileTokenizer.java
+++ b/libjava/classpath/gnu/javax/security/auth/login/ConfigFileTokenizer.java
@@ -1,5 +1,5 @@
 /* ConfigFileTokenizer.java -- JAAS Login Configuration default syntax tokenizer
-   Copyright (C) 2006 Free Software Foundation, Inc.
+   Copyright (C) 2006, 2010  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -81,7 +81,9 @@ import java.util.logging.Logger;
  */
 public class ConfigFileTokenizer
 {
-  private static final Logger log = Logger.getLogger(ConfigFileParser.class.getName());
+  private static final Logger log = Configuration.DEBUG ?
+                Logger.getLogger(ConfigFileParser.class.getName()) : null;
+
   /** A constant indicating that the end of the stream has been read. */
   public static final int TT_EOF = -1;
   /** A constant indicating that a word token has been read. */
@@ -92,7 +94,7 @@ public class ConfigFileTokenizer
   public String sval;
   public int ttype;
 
-  private BufferedReader br;
+  private final BufferedReader br;
   boolean initialised;
   private CPStringBuilder sb;
   private int sbNdx;
@@ -103,10 +105,7 @@ public class ConfigFileTokenizer
   /** Trivial constructor. */
   ConfigFileTokenizer(Reader r)
   {
-    super();
-
     br = r instanceof BufferedReader ? (BufferedReader) r : new BufferedReader(r);
-    initialised = false;
   }
 
   // Class methods
diff --git a/libjava/classpath/gnu/javax/security/auth/login/GnuConfiguration.java b/libjava/classpath/gnu/javax/security/auth/login/GnuConfiguration.java
index 20d8f3afd0d..6afe1cd195d 100644
--- a/libjava/classpath/gnu/javax/security/auth/login/GnuConfiguration.java
+++ b/libjava/classpath/gnu/javax/security/auth/login/GnuConfiguration.java
@@ -1,5 +1,5 @@
 /* GnuConfiguration.java -- GNU Classpath implementation of JAAS Configuration
-   Copyright (C) 2006 Free Software Foundation, Inc.
+   Copyright (C) 2006, 2010  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -128,7 +128,9 @@ import javax.security.auth.login.Configuration;
  */
 public final class GnuConfiguration extends Configuration
 {
-  private static final Logger log = Logger.getLogger(GnuConfiguration.class.getName());
+  private static final Logger log = gnu.java.security.Configuration.DEBUG ?
+                Logger.getLogger(GnuConfiguration.class.getName()) : null;
+
   /**
    * The internal map of login modules keyed by application name. Each entry in
    * this map is a {@link List} of {@link AppConfigurationEntry}s for that