/hg/icedtea6: Backpatch S6967533 fix for pre-Epoch System class ...

[vanaltj at icedtea.classpath.org]

changeset ab52bc9e9ed3 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=ab52bc9e9ed3
author: Jon VanAlten <jon.vanalten at redhat.com>
date: Thu Jul 29 16:07:11 2010 -0400

	Backpatch S6967533 fix for pre-Epoch System class initialization

	 * patches/openjdk/6967533-pre_epoch.patch: New file.
	Backpatched from jdk7 for upstream bug#6967533. Fixes
	IcedTea Bug#394: java.lang.ExceptionInInitializerError on
	systems with time set before January 1, 1970
	        * Makefile.am: include above patch.
	        * NEWS: Add 6967533 backport.


diffstat:

4 files changed, 69 insertions(+), 1 deletion(-)
ChangeLog                               |    9 ++++
Makefile.am                             |    3 +
NEWS                                    |    1 
patches/openjdk/6967533-pre_epoch.patch |   57 +++++++++++++++++++++++++++++++

diffs (101 lines):

diff -r 1d9802df001a -r ab52bc9e9ed3 ChangeLog
--- a/ChangeLog	Thu Jul 29 18:06:08 2010 +0100
+++ b/ChangeLog	Thu Jul 29 16:07:11 2010 -0400
@@ -1,3 +1,12 @@ 2010-07-29  Andrew John Hughes  <ahughes
+2010-07-29  Jon VanAlten  <jon.vanalten at redhat.com>
+
+	* patches/openjdk/6967533-pre_epoch.patch: New file.  Backpatched from
+	jdk7 for upstream bug#6967533.  Fixes IcedTea Bug#394:
+	java.lang.ExceptionInInitializerError on systems with
+	time set before January 1, 1970
+	* Makefile.am: include above patch.
+	* NEWS: Add 6967533 backport.
+
 2010-07-29  Andrew John Hughes  <ahughes at redhat.com>
 
 	* NEWS: Add 6961732 backport.
diff -r 1d9802df001a -r ab52bc9e9ed3 Makefile.am
--- a/Makefile.am	Thu Jul 29 18:06:08 2010 +0100
+++ b/Makefile.am	Thu Jul 29 16:07:11 2010 -0400
@@ -284,7 +284,8 @@ ICEDTEA_PATCHES = \
 	patches/no-sync.patch \
 	patches/icedtea-override-redirect-metacity.patch \
 	patches/openjdk/6963870-swing_npe.patch \
-	patches/openjdk/6668231-ssl_cert.patch
+	patches/openjdk/6668231-ssl_cert.patch \
+	patches/openjdk/6967533-pre_epoch.patch
 
 if WITH_RHINO
 ICEDTEA_PATCHES += \
diff -r 1d9802df001a -r ab52bc9e9ed3 NEWS
--- a/NEWS	Thu Jul 29 18:06:08 2010 +0100
+++ b/NEWS	Thu Jul 29 16:07:11 2010 -0400
@@ -689,6 +689,7 @@ New in release 1.9 (2010-XX-XX):
 * VisualVM support removed; now available in its own package at http://icedtea.classpath.org/hg/visualvm
 * Backports:
   - S6961732: FontMetrics.getLeading() may be negative in freetype-based OpenJDK builds
+  - S6967533: ExceptionInInitializerError on systems with uninitialized clock
 * Zero/Shark
   - Update Shark for LLVM 2.8 API change r100304
   - Shark calling static jni methods jclass argument fix.
diff -r 1d9802df001a -r ab52bc9e9ed3 patches/openjdk/6967533-pre_epoch.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/openjdk/6967533-pre_epoch.patch	Thu Jul 29 16:07:11 2010 -0400
@@ -0,0 +1,57 @@
+diff -r f13e94562d84 -r da8526047e5f src/share/classes/java/lang/System.java
+--- openjdk.old/jdk/src/share/classes/java/lang/System.java	Fri Jul 09 09:54:10 2010 -0700
++++ openjdk/jdk/src/share/classes/java/lang/System.java	Fri Jul 09 18:55:25 2010 -0700
+@@ -69,7 +69,7 @@
+      * corresponds to keyboard input or another input source specified by
+      * the host environment or user.
+      */
+-    public final static InputStream in = nullInputStream();
++    public final static InputStream in = null;
+ 
+     /**
+      * The "standard" output stream. This stream is already
+@@ -96,7 +96,7 @@
+      * @see     java.io.PrintStream#println(java.lang.Object)
+      * @see     java.io.PrintStream#println(java.lang.String)
+      */
+-    public final static PrintStream out = nullPrintStream();
++    public final static PrintStream out = null;
+ 
+     /**
+      * The "standard" error output stream. This stream is already
+@@ -110,7 +110,7 @@
+      * variable <code>out</code>, has been redirected to a file or other
+      * destination that is typically not continuously monitored.
+      */
+-    public final static PrintStream err = nullPrintStream();
++    public final static PrintStream err = null;
+ 
+     /* The security manager for the system.
+      */
+@@ -1093,26 +1093,6 @@
+     public static native String mapLibraryName(String libname);
+ 
+     /**
+-     * The following two methods exist because in, out, and err must be
+-     * initialized to null.  The compiler, however, cannot be permitted to
+-     * inline access to them, since they are later set to more sensible values
+-     * by initializeSystemClass().
+-     */
+-    private static InputStream nullInputStream() throws NullPointerException {
+-        if (currentTimeMillis() > 0) {
+-            return null;
+-        }
+-        throw new NullPointerException();
+-    }
+-
+-    private static PrintStream nullPrintStream() throws NullPointerException {
+-        if (currentTimeMillis() > 0) {
+-            return null;
+-        }
+-        throw new NullPointerException();
+-    }
+-
+-    /**
+      * Initialize the system class.  Called after thread initialization.
+      */
+     private static void initializeSystemClass() {