< prev index next >

src/java.base/share/classes/java/time/format/Parsed.java

Print this page

        

*** 1,7 **** /* ! * Copyright (c) 2012, 2019, Oracle and/or its affiliates. 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. Oracle designates this --- 1,7 ---- /* ! * Copyright (c) 2012, 2015, Oracle and/or its affiliates. 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. Oracle designates this
*** 397,407 **** long hap = fieldValues.remove(HOUR_OF_AMPM); if (resolverStyle == ResolverStyle.LENIENT) { updateCheckConflict(AMPM_OF_DAY, HOUR_OF_DAY, Math.addExact(Math.multiplyExact(ap, 12), hap)); } else { // STRICT or SMART AMPM_OF_DAY.checkValidValue(ap); ! HOUR_OF_AMPM.checkValidValue(hap); updateCheckConflict(AMPM_OF_DAY, HOUR_OF_DAY, ap * 12 + hap); } } if (fieldValues.containsKey(NANO_OF_DAY)) { long nod = fieldValues.remove(NANO_OF_DAY); --- 397,407 ---- long hap = fieldValues.remove(HOUR_OF_AMPM); if (resolverStyle == ResolverStyle.LENIENT) { updateCheckConflict(AMPM_OF_DAY, HOUR_OF_DAY, Math.addExact(Math.multiplyExact(ap, 12), hap)); } else { // STRICT or SMART AMPM_OF_DAY.checkValidValue(ap); ! HOUR_OF_AMPM.checkValidValue(ap); updateCheckConflict(AMPM_OF_DAY, HOUR_OF_DAY, ap * 12 + hap); } } if (fieldValues.containsKey(NANO_OF_DAY)) { long nod = fieldValues.remove(NANO_OF_DAY);
< prev index next >