6645263: (cal) Calendar throw java.lang.IllegalArgumentException: WEEK_OF_MONTH
Reviewed-by: okutsu
This commit is contained in:
parent
46533a9546
commit
ef34d89841
@ -1190,7 +1190,9 @@ public abstract class Calendar implements Serializable, Cloneable, Comparable<Ca
|
||||
*/
|
||||
public void set(int field, int value)
|
||||
{
|
||||
if (isLenient() && areFieldsSet && !areAllFieldsSet) {
|
||||
// If the fields are partially normalized, calculate all the
|
||||
// fields before changing any fields.
|
||||
if (areFieldsSet && !areAllFieldsSet) {
|
||||
computeFields();
|
||||
}
|
||||
internalSet(field, value);
|
||||
|
47
jdk/test/java/util/Calendar/Bug6645263.java
Normal file
47
jdk/test/java/util/Calendar/Bug6645263.java
Normal file
@ -0,0 +1,47 @@
|
||||
/*
|
||||
* Copyright (c) 2007 Sun Microsystems, Inc. All Rights Reserved.
|
||||
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||
*
|
||||
* This code is free software; you can redistribute it and/or modify it
|
||||
* under the terms of the GNU General Public License version 2 only, as
|
||||
* published by the Free Software Foundation.
|
||||
*
|
||||
* This code is distributed in the hope that it will be useful, but WITHOUT
|
||||
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
||||
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
|
||||
* version 2 for more details (a copy is included in the LICENSE file that
|
||||
* accompanied this code).
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License version
|
||||
* 2 along with this work; if not, write to the Free Software Foundation,
|
||||
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
*
|
||||
* Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
|
||||
* CA 95054 USA or visit www.sun.com if you need additional information or
|
||||
* have any questions.
|
||||
*/
|
||||
/*
|
||||
* @test
|
||||
* @bug 6645263
|
||||
* @summary Test field normalization in non-lenient from the partially normalized state
|
||||
*/
|
||||
|
||||
import java.util.*;
|
||||
|
||||
public class Bug6645263 {
|
||||
public static void main(String[] args) {
|
||||
Calendar cal = new GregorianCalendar(Locale.US);
|
||||
cal.setLenient(false);
|
||||
cal.set(Calendar.YEAR, 2007);
|
||||
cal.set(Calendar.MONTH, Calendar.NOVEMBER);
|
||||
cal.set(Calendar.WEEK_OF_MONTH, 4);
|
||||
cal.set(Calendar.DAY_OF_WEEK, 1);
|
||||
// Let cal calculate the time from the given fields
|
||||
cal.getTime();
|
||||
|
||||
// Change DAY_OF_MONTH
|
||||
cal.set(Calendar.DAY_OF_MONTH, 1);
|
||||
// The following line shouldn't throw an IllegalArgumentException.
|
||||
cal.getTime();
|
||||
}
|
||||
}
|
Loading…
Reference in New Issue
Block a user