2007-02-24  Jakub Jelinek  <jakub@redhat.com>

	* java/util/TimeZone.java (getDefaultDisplayName): Don't

	check if TimeZone is instanceof SimpleTimeZone.

2007-02-23  Jakub Jelinek  <jakub@redhat.com>

	PR libgcj/17002

	PR classpath/28550

	* java/lang/System.java: Add gnu.java.util.zoneinfo.dir to comments.

	* posix.cc (_Jv_platform_initProperties): Set

	gnu.java.util.zoneinfo.dir.

	* Makefile.am (ordinary_java_source_files): Add

	gnu/java/util/ZoneInfo.java.

	* Makefile.in: Regenerated.

	* java/util/Date.java (parse): Properly parse 09:01:02 as

	hours/minutes/seconds, not as hours/minutes/year.

	* java/util/SimpleTimeZone.java (getOffset): Handle properly

	millis + dstOffset overflowing into the next day.

	* java/util/TimeZone.java (zoneinfo_dir, availableIDs, aliases0): New

	static fields.

	(timezones): Remove synchronized keyword.  Set zoneinfo_dir.

	If non-null, set up aliases0 and don't put anything into

	timezones0.

	(defaultZone): Call getTZEnvVar to try TZ env var.

	Try to read /etc/localtime using ZoneInfo.readTZFile.

	Call getDefaultTimeZone instead of getTimeZone.

	(getDefaultTimeZone, getDateParams, parseTime): New private methods.

	(getTimeZoneInternal): New private method.

	(getTimeZone): Do the custom ID checking first, canonicalize

	ID for custom IDs as required by documentation.  Call

	getTimeZoneInternal to handle the rest.

	(getAvailableIDs(int)): Add locking.  Handle zoneinfo_dir != null.

	(getAvailableIDs(File,String,ArrayList)): New private method.

	(getAvailableIDs()): Add locking.  Handle zoneinfo_dir != null.

	(readSysconfigClockFile): New static method.

	(getTZEnvVar): New native method.

	* java/util/natSystem.cc: Include java/lang/Character.h and

	java/lang/Integer.h.

	(java::lang::System::getSystemTimeZone): Renamed to...

	(getSystemTimeZone): ... this.  Add static.

	(java::lang::System::init_properties): Don't set user.timezone

	property.

	(java::util::TimeZone::getDefaultTimeZoneId): New.

	(java::util::TimeZone::getTZEnvVar): New method.

	* gnu/java/util/ZoneInfo.java: New file.

	* java/util/GregorianCalendar.java

	(GregorianCalendar): Call clear before set in the constructors that

	don't initialize it to current time.

2007-02-09  Jakub Jelinek  <jakub@redhat.com>

	PR 23566

	* java/util/TimeZone.java (timezones): Regenerate from tzdata2007a.

2005-02-21  Jeroen Frijters  <jeroen@frijters.net>

	* java/util/GregorianCalendar.java

	(GregorianCalendar): Chained constructors to a (new)

	common constructor.

2004-01-03  Per Bothner  <per@bothner.com>

	* java/util/Date.java (parse):  Fix a number of problems.

	(skipParens):  Remove no-longer-needed method.

2003-11-27  Ito Kazumitsu  <kaz@maczuka.gcd.org>

	* java/util/GregorianCalendar.java (getLinearTime): Avoid counting

	the leap day of the leap year twice.

2003-09-18  Ingo Proetel  <proetel@aicas.com>

	* java/util/TimeZone.java: Initialize lazily.

2002-05-13  Tom Tromey  <tromey@redhat.com>

	* java/util/TimeZone.java (getDefaultTimeZoneId): New method.

--- libjava/Makefile.am.jj	2007-02-23 21:17:39.000000000 +0100

+++ libjava/Makefile.am	2007-02-23 21:28:22.000000000 +0100

@@ -1431,6 +1431,7 @@ gnu/java/text/LineBreakIterator.java \

 gnu/java/text/SentenceBreakIterator.java	\

 gnu/java/text/WordBreakIterator.java \

 gnu/java/util/DoubleEnumeration.java \

+gnu/java/util/ZoneInfo.java \

 java/lang/ref/PhantomReference.java \

 java/lang/ref/Reference.java \

 java/lang/ref/ReferenceQueue.java \

--- libjava/Makefile.in.jj	2007-02-23 21:17:39.000000000 +0100

+++ libjava/Makefile.in	2007-02-23 21:28:55.000000000 +0100

@@ -1183,6 +1183,7 @@ gnu/java/text/LineBreakIterator.java \

 gnu/java/text/SentenceBreakIterator.java	\

 gnu/java/text/WordBreakIterator.java \

 gnu/java/util/DoubleEnumeration.java \

+gnu/java/util/ZoneInfo.java \

 java/lang/ref/PhantomReference.java \

 java/lang/ref/Reference.java \

 java/lang/ref/ReferenceQueue.java \

@@ -2017,7 +2018,8 @@ DEP_FILES =  .deps/$(srcdir)/$(CONVERT_D

 .deps/gnu/java/text/LineBreakIterator.P \

 .deps/gnu/java/text/SentenceBreakIterator.P \

 .deps/gnu/java/text/WordBreakIterator.P \

-.deps/gnu/java/util/DoubleEnumeration.P .deps/interpret.P \

+.deps/gnu/java/util/DoubleEnumeration.P \

+.deps/gnu/java/util/ZoneInfo.P .deps/interpret.P \

 .deps/java/applet/Applet.P .deps/java/applet/AppletContext.P \

 .deps/java/applet/AppletStub.P .deps/java/applet/AudioClip.P \

 .deps/java/awt/AWTError.P .deps/java/awt/AWTEvent.P \

--- libjava/java/util/GregorianCalendar.java.jj	2007-02-23 21:17:36.000000000 +0100

+++ libjava/java/util/GregorianCalendar.java	2007-02-26 09:54:12.000000000 +0100

@@ -111,6 +111,13 @@ public class GregorianCalendar extends C

     this(TimeZone.getDefault(), locale);

   }

+  private GregorianCalendar(TimeZone zone, Locale locale, boolean unused)

+  {

+    super(zone, locale);

+    ResourceBundle rb = ResourceBundle.getBundle(bundleName, locale);

+    gregorianCutover = ((Date) rb.getObject("gregorianCutOver")).getTime();

+  }

+

   /**

    * Constructs a new GregorianCalender representing the current

    * time with the given time zone and the given locale.

@@ -119,9 +126,7 @@ public class GregorianCalendar extends C

    */

   public GregorianCalendar(TimeZone zone, Locale locale)

   {

-    super(zone, locale);

-    ResourceBundle rb = ResourceBundle.getBundle(bundleName, locale);

-    gregorianCutover = ((Date) rb.getObject("gregorianCutOver")).getTime();

+    this(zone, locale, false);

     setTimeInMillis(System.currentTimeMillis());

   }

@@ -134,7 +139,8 @@ public class GregorianCalendar extends C

    */

   public GregorianCalendar(int year, int month, int day)

   {

-    super();

+    this(TimeZone.getDefault(), Locale.getDefault(), false);

+    clear();

     set(year, month, day);

   }

@@ -149,7 +155,8 @@ public class GregorianCalendar extends C

    */

   public GregorianCalendar(int year, int month, int day, int hour, int minute)

   {

-    super();

+    this(TimeZone.getDefault(), Locale.getDefault(), false);

+    clear();

     set(year, month, day, hour, minute);

   }

@@ -166,7 +173,8 @@ public class GregorianCalendar extends C

   public GregorianCalendar(int year, int month, int day,

 			   int hour, int minute, int second)

   {

-    super();

+    this(TimeZone.getDefault(), Locale.getDefault(), false);

+    clear();

     set(year, month, day, hour, minute, second);

   }

@@ -254,8 +262,10 @@ public class GregorianCalendar extends C

 	//

 	// The additional leap year factor accounts for the fact that

 	// a leap day is not seen on Jan 1 of the leap year.

+	// And on and after the leap day, the leap day has already been

+	// included in dayOfYear.

 	int gregOffset = (year / 400) - (year / 100) + 2;

-	if (isLeapYear (year, true) && dayOfYear < 31 + 29)

+	if (isLeapYear (year, true))

 	  --gregOffset;

 	time += gregOffset * (24 * 60 * 60 * 1000L);

       }

--- libjava/java/util/SimpleTimeZone.java.jj	2007-02-23 21:17:36.000000000 +0100

+++ libjava/java/util/SimpleTimeZone.java	2007-02-23 21:27:21.000000000 +0100

@@ -458,16 +458,34 @@ public class SimpleTimeZone extends Time

     int daylightSavings = 0;

     if (useDaylight && era == GregorianCalendar.AD && year >= startYear)

       {

+	int orig_year = year;

 	// This does only work for Gregorian calendars :-(

 	// This is mainly because setStartYear doesn't take an era.

 	boolean afterStart = !isBefore(year, month, day, dayOfWeek, millis,

 				       startMode, startMonth,

 				       startDay, startDayOfWeek, startTime);

+	millis += dstSavings;

+	if (millis >= 24 * 60 * 60 * 1000)

+	  {

+	    millis -= 24 * 60 * 60 * 1000;

+	    dayOfWeek = (dayOfWeek % 7) + 1;

+	    if (++day > getDaysInMonth(month, year))

+	      {

+		day = 1;

+		if (month++ == Calendar.DECEMBER)

+		  {

+		    month = Calendar.JANUARY;

+		    year++;

+		  }

+	      }

+	  }

 	boolean beforeEnd = isBefore(year, month, day, dayOfWeek, millis,

 				     endMode, endMonth,

 				     endDay, endDayOfWeek, endTime);

+	if (orig_year != year)

+	  afterStart = false;

 	if (startMonth < endMonth)

 	  {

 	    // use daylight savings, if the date is after the start of

--- libjava/java/util/Date.java.jj	2007-02-23 21:17:36.000000000 +0100

+++ libjava/java/util/Date.java	2007-02-26 09:43:28.000000000 +0100

@@ -304,34 +304,6 @@ public class Date implements Cloneable, 

     return format.format(this);

   }

-  private static int skipParens(String string, int offset)

-  {

-    int len = string.length();

-    int p = 0;

-    int i;

-

-    for (i = offset; i < len; ++i)

-      {

-	if (string.charAt(i) == '(')

-	  ++p;

-	else if (string.charAt(i) == ')')

-	  {

-	    --p;

-	    if (p == 0)

-	      return i + 1;

-	    // If we've encounted unbalanced parens, just return the

-	    // leftover one as an ordinary character.  It will be

-	    // caught later in parsing and cause an

-	    // IllegalArgumentException.

-      	    if (p < 0)

-	      return i;

-	  }

-      }

-

-    // Not sure what to do if `p != 0' here.

-    return i;

-  }

-

   private static int parseTz(String tok, char sign)

     throws IllegalArgumentException

   {

@@ -408,20 +380,25 @@ public class Date implements Cloneable, 

     // Trim out any nested stuff in parentheses now to make parsing easier.

     StringBuffer buf = new StringBuffer();

-    int off = 0;

-    int openParenOffset, tmpMonth;

-    while ((openParenOffset = string.indexOf('(', off)) >= 0)

+    int parenNesting = 0;

+    int len = string.length();

+    for (int i = 0;  i < len;  i++)

       {

-	// Copy part of string leading up to open paren.

-	buf.append(string.substring(off, openParenOffset));

-	off = skipParens(string, openParenOffset);

+	char ch = string.charAt(i);

+	if (ch >= 'a' && ch <= 'z')

+	  ch -= 'a' - 'A';

+	if (ch == '(')

+	  parenNesting++;

+	else if (parenNesting == 0)

+	  buf.append(ch);

+	else if (ch == ')')

+	  parenNesting--;

       }

-    buf.append(string.substring(off));

+    int tmpMonth;

     // Make all chars upper case to simplify comparisons later.

     // Also ignore commas; treat them as delimiters.

-    StringTokenizer strtok =

-      new StringTokenizer(buf.toString().toUpperCase(), " \t\n\r,");

+    StringTokenizer strtok = new StringTokenizer(buf.toString(), " \t\n\r,");

     while (strtok.hasMoreTokens())

       {

@@ -434,58 +411,69 @@ public class Date implements Cloneable, 

 	  }

 	else if (firstch >= '0' && firstch <= '9')

 	  {

+	    int lastPunct = -1;

 	    while (tok != null && tok.length() > 0)

 	      {

-	        // A colon or slash may be valid in the number.

-	        // Find the first of these before calling parseInt.

-	        int colon = tok.indexOf(':');

-	        int slash = tok.indexOf('/');

-	        int hyphen = tok.indexOf('-');

-		// We choose tok.length initially because it makes

-		// processing simpler.

-	        int punctOffset = tok.length();

-		if (colon >= 0)

-		  punctOffset = Math.min(punctOffset, colon);

-	        if (slash >= 0)

-	          punctOffset = Math.min(punctOffset, slash);

-	        if (hyphen >= 0)

-	          punctOffset = Math.min(punctOffset, hyphen);

-		// Following code relies on -1 being the exceptional

-		// case.

-		if (punctOffset == tok.length())

-		  punctOffset = -1;

-

-	        int num;

-	        try

-	          {

-		    num = Integer.parseInt(punctOffset < 0 ? tok :

-					   tok.substring(0, punctOffset));

-	          }

-	        catch (NumberFormatException ex)

-	          {

-		    throw new IllegalArgumentException(tok);

-	          }

-

-		// TBD: Spec says year can be followed by a slash.  That might

-		// make sense if using YY/MM/DD formats, but it would fail in

-		// that format for years <= 70.  Also, what about 1900?  That

-		// is interpreted as the year 3800; seems that the comparison

-		// should be num >= 1900 rather than just > 1900.

-		// What about a year of 62 - 70?  (61 or less could be a (leap)

-		// second).  70/MM/DD cause an exception but 71/MM/DD is ok

-		// even though there's no ambiguity in either case.

-		// For the parse method, the spec as written seems too loose.

-		// Until shown otherwise, we'll follow the spec as written.

-	        if (num > 70 && (punctOffset < 0 || punctOffset == slash))

-		  year = num > 1900 ? num - 1900 : num;

-		else if (punctOffset > 0 && punctOffset == colon)

+		int punctOffset = tok.length();

+		int num = 0;

+		int punct;

+		for (int i = 0;  ;  i++)

+		  {

+		    if (i >= punctOffset)

+		      {

+			punct = -1;

+			break;

+		      }

+		    else

+		      {

+			punct = tok.charAt(i);

+			if (punct >= '0' && punct <= '9')

+			  {

+			    if (num > 999999999) // in case of overflow

+			      throw new IllegalArgumentException(tok);

+			    num = 10 * num + (punct - '0');

+			  }

+			else

+			  {

+			    punctOffset = i;

+			    break;

+			  }

+		      }

+		      

+		  }

+

+		if (punct == ':')

 		  {

 		    if (hour < 0)

 		      hour = num;

 		    else

 		      minute = num;

 		  }

-		else if (punctOffset > 0 && punctOffset == slash)

+		else if (lastPunct == ':' && hour >= 0 && (minute < 0 || second < 0))

+		  {

+		    if (minute < 0)

+		      minute = num;

+		    else

+		      second = num;

+		  }

+	        else if ((num >= 70

+			  && (punct == ' ' || punct == ','

+			      || punct == '/' || punct < 0))

+			 || (num < 70 && day >= 0 && month >= 0 && year < 0))

+		  {

+		    if (num >= 100)

+		      year = num;

+		    else

+		      {

+			int curYear = 1900 + new Date().getYear();

+			int firstYear = curYear - 80;

+			year = firstYear / 100 * 100 + num;

+			int yx = year;

+			if (year < firstYear)

+			  year += 100;

+		      }

+		  }

+		else if (punct == '/')

 		  {

 		    if (month < 0)

 		      month = num - 1;

@@ -502,10 +490,11 @@ public class Date implements Cloneable, 

 		  throw new IllegalArgumentException(tok);

 		// Advance string if there's more to process in this token.

-		if (punctOffset < 0 || punctOffset + 1 >= tok.length())

+		if (punct < 0 || punctOffset + 1 >= tok.length())

 		  tok = null;

 		else

 		  tok = tok.substring(punctOffset + 1);

+		lastPunct = punct;

 	      }

 	  }

 	else if (firstch >= 'A' && firstch <= 'Z')

@@ -573,22 +562,29 @@ public class Date implements Cloneable, 

 	  throw new IllegalArgumentException(tok);

       }

-    // Unspecified minutes and seconds should default to 0.

+    // Unspecified hours, minutes, or seconds should default to 0.

+    if (hour < 0)

+      hour = 0;

     if (minute < 0)

       minute = 0;

     if (second < 0)

       second = 0;

     // Throw exception if any other fields have not been recognized and set.

-    if (year < 0 || month < 0 || day < 0 || hour < 0)

+    if (year < 0 || month < 0 || day < 0)

       throw new IllegalArgumentException("Missing field");

     // Return the time in either local time or relative to GMT as parsed.

     // If no time-zone was specified, get the local one (in minutes) and

     // convert to milliseconds before adding to the UTC.

-    return UTC(year, month, day, hour, minute, second) + (localTimezone ?

-		new Date(year, month, day).getTimezoneOffset() * 60 * 1000:

-		-timezone * 60 * 1000);

+    GregorianCalendar cal

+      = new GregorianCalendar(year, month, day, hour, minute, second);

+    if (!localTimezone)

+      {

+	cal.set(Calendar.ZONE_OFFSET, timezone * 60 * 1000);

+	cal.set(Calendar.DST_OFFSET, 0);

+      }

+    return cal.getTimeInMillis();

   }

   /**

--- libjava/java/lang/natSystem.cc.jj	2007-02-23 21:17:31.000000000 +0100

+++ libjava/java/lang/natSystem.cc	2007-02-24 22:04:41.000000000 +0100

@@ -51,6 +51,8 @@ details.  */

 #include <java/lang/Class.h>

 #include <java/lang/ArrayStoreException.h>

 #include <java/lang/ArrayIndexOutOfBoundsException.h>

+#include <java/lang/Character.h>

+#include <java/lang/Integer.h>

 #include <java/lang/NullPointerException.h>

 #include <java/lang/StringBuffer.h>

 #include <java/util/Properties.h>

@@ -229,61 +231,6 @@ getpwuid_adaptor(T_passwd * (*getpwuid_r

 }

 #endif

-/*

- * This method returns a time zone string that is used by init_properties

- * to set the default timezone property 'user.timezone'.  That value is

- * used by default as a key into the timezone table used by the

- * java::util::TimeZone class.

- */

-jstring

-java::lang::System::getSystemTimeZone (void)

-{

-  struct tm *tim;

-  time_t current_time;

-  long tzoffset;

-  const char *tz1, *tz2;

-  char *tzid;

-

-  current_time = time(0);

-

-  mktime(tim = localtime(&current_time));

-#ifdef STRUCT_TM_HAS_GMTOFF

-  // tm_gmtoff is secs EAST of UTC.

-  tzoffset = -(tim->tm_gmtoff) + tim->tm_isdst * 3600L;

-#elif HAVE_TIMEZONE

-  // timezone is secs WEST of UTC.

-  tzoffset = timezone;	

-#else

-  // FIXME: there must be another global if neither tm_gmtoff nor timezone

-  // is available, esp. if tzname is valid.

-  // Richard Earnshaw <rearnsha@arm.com> has suggested using difftime to

-  // calculate between gmtime and localtime (and accounting for possible

-  // daylight savings time) as an alternative.

-  tzoffset = 0L;

-#endif

-

-#ifdef HAVE_TM_ZONE

-  tz1 = tim->tm_zone;

-  tz2 = "";

-#elif defined (HAVE_TZNAME)

-  tz1 = tzname[0];

-  tz2 = strcmp (tzname[0], tzname[1]) ? tzname[1] : "";

-#else

-  // Some targets have no concept of timezones.

-  tz1 = "???";

-  tz2 = tz1;

-#endif

-

-  if ((tzoffset % 3600) == 0)

-    tzoffset = tzoffset / 3600;

-

-  tzid = (char*) _Jv_Malloc (strlen(tz1) + strlen(tz2) + 6);

-  sprintf(tzid, "%s%ld%s", tz1, tzoffset, tz2);

-  jstring retval = JvNewStringUTF (tzid);

-  _Jv_Free (tzid);

-

-  return retval;

-}

 extern void _Jv_SetDLLSearchPath (const char *);

@@ -441,11 +388,6 @@ java::lang::System::init_properties (voi

       SET ("user.region", "US");

     }  

-  // Set the "user.timezone" property.

-  jstring timezone = getDefaultTimeZoneId ();

-  if (timezone != NULL)

-    newprops->put (JvNewStringLatin1 ("user.timezone"), timezone);

-

   // Set some properties according to whatever was compiled in with

   // `-D'.

   for (int i = 0; _Jv_Compiler_Properties[i]; ++i)

@@ -529,3 +471,146 @@ java::lang::System::init_properties (voi

   // synchronized in the common case.

   properties = newprops;

 }

+

+/*

+ * This method returns a time zone string that is used by init_properties

+ * to set the default timezone property 'user.timezone'.  That value is

+ * used by default as a key into the timezone table used by the

+ * java::util::TimeZone class.

+ */

+static jstring

+getSystemTimeZone (void)

+{

+  struct tm *tim;

+  time_t current_time;

+  long tzoffset;

+  const char *tz1, *tz2;

+  char *tzid;

+

+  current_time = time(0);

+

+  mktime(tim = localtime(&current_time));

+#ifdef STRUCT_TM_HAS_GMTOFF

+  // tm_gmtoff is secs EAST of UTC.

+  tzoffset = -(tim->tm_gmtoff) + tim->tm_isdst * 3600L;

+#elif HAVE_TIMEZONE

+  // timezone is secs WEST of UTC.

+  tzoffset = timezone;	

+#else

+  // FIXME: there must be another global if neither tm_gmtoff nor timezone

+  // is available, esp. if tzname is valid.

+  // Richard Earnshaw <rearnsha@arm.com> has suggested using difftime to

+  // calculate between gmtime and localtime (and accounting for possible

+  // daylight savings time) as an alternative.

+  tzoffset = 0L;

+#endif

+

+#ifdef HAVE_TM_ZONE

+  tz1 = tim->tm_zone;

+  tz2 = "";

+#elif defined (HAVE_TZNAME)

+  tz1 = tzname[0];

+  tz2 = strcmp (tzname[0], tzname[1]) ? tzname[1] : "";

+#else

+  // Some targets have no concept of timezones.

+  tz1 = "???";

+  tz2 = tz1;

+#endif

+

+  if ((tzoffset % 3600) == 0)

+    tzoffset = tzoffset / 3600;

+

+  tzid = (char*) _Jv_Malloc (strlen(tz1) + strlen(tz2) + 6);

+  sprintf(tzid, "%s%ld%s", tz1, tzoffset, tz2);

+  jstring retval = JvNewStringUTF (tzid);

+  _Jv_Free (tzid);

+

+  return retval;

+}

+

+// Get the System Timezone as reported by the OS.  It should be in

+// the form PST8PDT so we'll need to parse it and check that it's valid.

+// FIXME: Using the code from Classpath for generating the System

+// Timezone IMO is suboptimal because it ignores whether the rules for

+// DST match up.

+jstring

+java::util::TimeZone::getDefaultTimeZoneId ()

+{

+  jstring sysTimeZoneId = getSystemTimeZone ();

+

+  using namespace java::lang;

+

+  // Check if this is a valid timezone.  Make sure the IDs match

+  // since getTimeZone returns GMT if no match is found.

+  TimeZone *tz = TimeZone::getTimeZone (sysTimeZoneId);

+  if (tz->getID ()->equals (sysTimeZoneId))

+    return sysTimeZoneId;

+

+  // Check if the base part of sysTimeZoneId is a valid timezone that

+  // matches with daylight usage and rawOffset.  Make sure the IDs match

+  // since getTimeZone returns GMT if no match is found.

+  // First find start of GMT offset info and any Daylight zone name.

+  int startGMToffset = 0;

+  int sysTimeZoneIdLength = sysTimeZoneId->length();

+  for (int i = 0; i < sysTimeZoneIdLength && startGMToffset == 0; i++)

+    {

+      if (Character::isDigit (sysTimeZoneId->charAt (i)))

+	startGMToffset = i;

+    }

+

+  int startDaylightZoneName = 0;

+  jboolean usesDaylight = false;

+  for (int i = sysTimeZoneIdLength - 1;

+       i >= 0 && !Character::isDigit (sysTimeZoneId->charAt (i)); --i)

+    {

+      startDaylightZoneName = i;

+    }

+  if (startDaylightZoneName > 0)

+    usesDaylight = true;

+

+  int GMToffset

+    = Integer::parseInt (startDaylightZoneName == 0 ?

+			 sysTimeZoneId->substring (startGMToffset) :

+			 sysTimeZoneId->substring (startGMToffset,

+						   startDaylightZoneName));

+

+  // Offset could be in hours or seconds.  Convert to millis.

+  if (GMToffset < 24)

+    GMToffset *= 60 * 60;

+  GMToffset *= -1000;

+

+  jstring tzBasename = sysTimeZoneId->substring (0, startGMToffset);

+  tz = TimeZone::getTimeZone (tzBasename);

+  if (tz->getID ()->equals (tzBasename) && tz->getRawOffset () == GMToffset)

+    {

+      jboolean tzUsesDaylight = tz->useDaylightTime ();

+      if (usesDaylight && tzUsesDaylight || !usesDaylight && !tzUsesDaylight)

+	return tzBasename;

+    }

+

+  // If no match, see if a valid timezone has the same attributes as this

+  // and then use it instead.

+  jstringArray IDs = TimeZone::getAvailableIDs (GMToffset);

+  jstring *elts = elements (IDs);

+  for (int i = 0; i < IDs->length; ++i)

+    {

+      // FIXME: The daylight savings rules may not match the rules

+      // for the desired zone.

+      jboolean IDusesDaylight =

+	TimeZone::getTimeZone (elts[i])->useDaylightTime ();

+      if (usesDaylight && IDusesDaylight || !usesDaylight && !IDusesDaylight)

+	return elts[i];

+    }

+

+  // If all else fails, return null.

+  return NULL;

+}

+

+jstring

+java::util::TimeZone::getTZEnvVar ()

+{

+  const char *tzenv = ::getenv ("TZ");

+  if (tzenv == NULL)

+    return NULL;

+  return JvNewStringUTF (tzenv);

+}

--- libjava/java/util/TimeZone.java.jj	2007-02-23 21:17:36.000000000 +0100

+++ libjava/java/util/TimeZone.java	2007-02-24 21:54:41.000000000 +0100

@@ -1,5 +1,6 @@

 /* java.util.TimeZone

-   Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.

+   Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003

+   Free Software Foundation, Inc.

 This file is part of GNU Classpath.

@@ -37,6 +38,13 @@ exception statement from your version. *

 package java.util;

+import gnu.java.util.ZoneInfo;

+import java.io.BufferedInputStream;

+import java.io.BufferedReader;

+import java.io.File;

+import java.io.FileInputStream;

+import java.io.InputStreamReader;

+import java.io.IOException;

 import java.text.DateFormatSymbols;

 /**

@@ -79,690 +87,1215 @@ public abstract class TimeZone implement

   /**

    * The default time zone, as returned by getDefault.

    */

-  private static TimeZone defaultZone;

+  private static TimeZone defaultZone0;

+  /* initialize this static field lazily to overhead if

+   * it is not needed: 

+   */

+  private static synchronized TimeZone defaultZone() {

+    /* Look up default timezone */

+    if (defaultZone0 == null) 

+      {

+        // System.loadLibrary("javautil");