From 4f9533c7722fa07511a94d005227961f4a4dec23 Mon Sep 17 00:00:00 2001
From: Mark Wielaard <mark@gcc.gnu.org>
Date: Thu, 18 May 2006 17:29:21 +0000
Subject: Imported GNU Classpath 0.90

       Imported GNU Classpath 0.90
       * scripts/makemake.tcl: LocaleData.java moved to gnu/java/locale.

       * sources.am: Regenerated.
       * gcj/javaprims.h: Regenerated.
       * Makefile.in: Regenerated.
       * gcj/Makefile.in: Regenerated.
       * include/Makefile.in: Regenerated.
       * testsuite/Makefile.in: Regenerated.

       * gnu/java/lang/VMInstrumentationImpl.java: New override.
       * gnu/java/net/local/LocalSocketImpl.java: Likewise.
       * gnu/classpath/jdwp/VMMethod.java: Likewise.
       * gnu/classpath/jdwp/VMVirtualMachine.java: Update to latest
       interface.
       * java/lang/Thread.java: Add UncaughtExceptionHandler.
       * java/lang/reflect/Method.java: Implements GenericDeclaration and
       isSynthetic(),
       * java/lang/reflect/Field.java: Likewise.
       * java/lang/reflect/Constructor.java
       * java/lang/Class.java: Implements Type, GenericDeclaration,
       getSimpleName() and getEnclosing*() methods.
       * java/lang/Class.h: Add new public methods.
       * java/lang/Math.java: Add signum(), ulp() and log10().
       * java/lang/natMath.cc (log10): New function.
       * java/security/VMSecureRandom.java: New override.
       * java/util/logging/Logger.java: Updated to latest classpath
       version.
       * java/util/logging/LogManager.java: New override.

From-SVN: r113887
---
 libjava/classpath/java/sql/DriverManager.java | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

(limited to 'libjava/classpath/java/sql/DriverManager.java')

diff --git a/libjava/classpath/java/sql/DriverManager.java b/libjava/classpath/java/sql/DriverManager.java
index 9e252abcc60..94f743b92da 100644
--- a/libjava/classpath/java/sql/DriverManager.java
+++ b/libjava/classpath/java/sql/DriverManager.java
@@ -1,5 +1,6 @@
 /* DriverManager.java -- Manage JDBC drivers
-   Copyright (C) 1999, 2000, 2001, 2003, 2004 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2000, 2001, 2003, 2004, 2006
+   Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -292,11 +293,11 @@ public class DriverManager
    * This method set the login timeout used by JDBC drivers.  This is a
    * system-wide parameter that applies to all drivers.
    *
-   * @param login_timeout The new login timeout value.
+   * @param seconds The new login timeout value.
    */
   public static void setLoginTimeout(int seconds)
   {
-    DriverManager.login_timeout = login_timeout;  
+    DriverManager.login_timeout = seconds;  
   }
 
   /**
@@ -312,20 +313,18 @@ public class DriverManager
   /**
    * This method sets the log stream in use by JDBC.
    *
-   * @param log_stream The log stream in use by JDBC.
-   *
+   * @param stream The log stream in use by JDBC.
    * @deprecated Use <code>setLogWriter</code> instead.
    */
-  public static void setLogStream(PrintStream out)
+  public static void setLogStream(PrintStream stream)
   {
-    DriverManager.log_stream = log_stream;
+    DriverManager.log_stream = stream;
   }
 
   /**
    * This method returns the log stream in use by JDBC.
    *
    * @return The log stream in use by JDBC.
-   *
    * @deprecated Use <code>getLogWriter()</code> instead.
    */
   public static PrintStream getLogStream()
@@ -336,7 +335,7 @@ public class DriverManager
   /**
    * This method prints the specified line to the log stream.
    *
-   * @param str The string to write to the log stream.
+   * @param message The string to write to the log stream.
    */
   public static void println(String message)
   {
-- 
cgit v1.2.1