Author: hindessm
Date: Sat Nov 10 02:42:29 2007
New Revision: 593762
URL: http://svn.apache.org/viewvc?rev=593762&view=rev
Log:
Applied workaround from "[#HARMONY-5100] [classlib]Dacapo.jython
regression after migrating the locale data".
Modified:
harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/util/TimeZone.java
Modified: harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/util/TimeZone.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/util/TimeZone.java?rev=593762&r1=593761&r2=593762&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/util/TimeZone.java (original)
+++ harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/util/TimeZone.java Sat
Nov 10 02:42:29 2007
@@ -222,8 +222,9 @@
String[][] zones = data.getZoneStrings();
for (int i = 0; i < zones.length; i++) {
if (id.equals(zones[i][0])) {
- return style == SHORT ? zones[i][useDaylight ? 4 : 2]
+ String res = style == SHORT ? zones[i][useDaylight ? 4 : 2]
: zones[i][useDaylight ? 3 : 1];
+ return res == null ? "" : res;
}
}
int offset = getRawOffset();
|