| Index: /icu4j/trunk/main/classes/core/src/com/ibm/icu/text/SimpleDateFormat.java | |
| =================================================================== | |
| --- /icu4j/trunk/main/classes/core/src/com/ibm/icu/text/SimpleDateFormat.java (revision 34829) | |
| +++ /icu4j/trunk/main/classes/core/src/com/ibm/icu/text/SimpleDateFormat.java (revision 34830) | |
| @@ -1,5 +1,5 @@ | |
| /* | |
| ******************************************************************************* | |
| - * Copyright (C) 1996-2013, International Business Machines Corporation and * | |
| + * Copyright (C) 1996-2014, International Business Machines Corporation and * | |
| * others. All Rights Reserved. * | |
| ******************************************************************************* | |
| @@ -2820,5 +2820,5 @@ | |
| if ( override != null && (override.compareTo("hebr") == 0 || override.indexOf("y=hebr") >= 0) && value < 1000 ) { | |
| value += HEBREW_CAL_CUR_MILLENIUM_START_YEAR; | |
| - } else if (count == 2 && (pos.getIndex() - start) == 2 && !isChineseCalendar | |
| + } else if (count == 2 && (pos.getIndex() - start) == 2 && !isChineseCalendar && !cal.getType().equals("japanese") | |
| && UCharacter.isDigit(text.charAt(start)) | |
| && UCharacter.isDigit(text.charAt(start+1))) |