Merge
This commit is contained in:
commit
95789034d0
jaxp
src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/datatype
test/javax/xml/jaxp/unittest/datatype
6
jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/datatype/DurationImpl.java
6
jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/datatype/DurationImpl.java
@ -357,7 +357,7 @@ class DurationImpl
|
|||||||
* The length of the duration in milliseconds.
|
* The length of the duration in milliseconds.
|
||||||
*/
|
*/
|
||||||
protected DurationImpl(final long durationInMilliSeconds) {
|
protected DurationImpl(final long durationInMilliSeconds) {
|
||||||
|
boolean is0x8000000000000000L = false;
|
||||||
long l = durationInMilliSeconds;
|
long l = durationInMilliSeconds;
|
||||||
|
|
||||||
if (l > 0) {
|
if (l > 0) {
|
||||||
@ -368,6 +368,7 @@ class DurationImpl
|
|||||||
if (l == 0x8000000000000000L) {
|
if (l == 0x8000000000000000L) {
|
||||||
// negating 0x8000000000000000L causes an overflow
|
// negating 0x8000000000000000L causes an overflow
|
||||||
l++;
|
l++;
|
||||||
|
is0x8000000000000000L = true;
|
||||||
}
|
}
|
||||||
l *= -1;
|
l *= -1;
|
||||||
}
|
}
|
||||||
@ -406,7 +407,8 @@ class DurationImpl
|
|||||||
|
|
||||||
// seconds & milliseconds
|
// seconds & milliseconds
|
||||||
int2long = (gregorianCalendar.get(Calendar.SECOND) * 1000)
|
int2long = (gregorianCalendar.get(Calendar.SECOND) * 1000)
|
||||||
+ gregorianCalendar.get(Calendar.MILLISECOND);
|
+ gregorianCalendar.get(Calendar.MILLISECOND)
|
||||||
|
+ (is0x8000000000000000L ? 1 : 0);
|
||||||
this.seconds = BigDecimal.valueOf(int2long, 3);
|
this.seconds = BigDecimal.valueOf(int2long, 3);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -0,0 +1,47 @@
|
|||||||
|
/*
|
||||||
|
* Copyright (c) 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.
|
||||||
|
*
|
||||||
|
* 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 Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
|
||||||
|
* or visit www.oracle.com if you need additional information or have any
|
||||||
|
* questions.
|
||||||
|
*/
|
||||||
|
package datatype;
|
||||||
|
|
||||||
|
import javax.xml.datatype.DatatypeConfigurationException;
|
||||||
|
import javax.xml.datatype.DatatypeFactory;
|
||||||
|
import javax.xml.datatype.Duration;
|
||||||
|
|
||||||
|
import org.testng.Assert;
|
||||||
|
import org.testng.annotations.Test;
|
||||||
|
|
||||||
|
/*
|
||||||
|
* @bug 8068839
|
||||||
|
* @summary Verifies that Duration's edge cases
|
||||||
|
*/
|
||||||
|
public class JDK8068839Test {
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void test() throws DatatypeConfigurationException {
|
||||||
|
DatatypeFactory df = DatatypeFactory.newInstance();
|
||||||
|
Duration durationx = df.newDuration(Long.MIN_VALUE);
|
||||||
|
Assert.assertEquals(durationx.toString(), "-P292277024Y7M16DT7H12M55.808S");
|
||||||
|
durationx = df.newDuration(Long.MAX_VALUE);
|
||||||
|
Assert.assertEquals(durationx.toString(), "P292277024Y7M16DT7H12M55.807S");
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
Loading…
x
Reference in New Issue
Block a user