Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openanolis
dragonwell8_jdk
提交
3a9753ed
D
dragonwell8_jdk
项目概览
openanolis
/
dragonwell8_jdk
通知
3
Star
2
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
D
dragonwell8_jdk
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
3a9753ed
编写于
4月 25, 2019
作者:
A
andrew
浏览文件
操作
浏览文件
下载
差异文件
Merge
上级
a7c38674
42936a2c
变更
7
隐藏空白更改
内联
并排
Showing
7 changed file
with
91 addition
and
27 deletion
+91
-27
.hgtags
.hgtags
+3
-0
src/share/classes/java/math/BigDecimal.java
src/share/classes/java/math/BigDecimal.java
+39
-11
src/share/classes/sun/rmi/registry/RegistryImpl_Skel.java
src/share/classes/sun/rmi/registry/RegistryImpl_Skel.java
+19
-3
src/share/classes/sun/rmi/server/UnicastServerRef.java
src/share/classes/sun/rmi/server/UnicastServerRef.java
+12
-11
src/share/native/sun/font/layout/ContextualSubstSubtables.cpp
...share/native/sun/font/layout/ContextualSubstSubtables.cpp
+4
-1
src/share/native/sun/font/layout/GlyphIterator.cpp
src/share/native/sun/font/layout/GlyphIterator.cpp
+10
-0
src/share/native/sun/font/layout/SubstitutionLookups.cpp
src/share/native/sun/font/layout/SubstitutionLookups.cpp
+4
-1
未找到文件。
.hgtags
浏览文件 @
3a9753ed
...
...
@@ -985,3 +985,6 @@ d10b8de706c1ea867abc5518dbb1cf92f6965f6a jdk8u202-ga
fcf246aa327f6384be94464b2c8aa0ef03af473d jdk8u222-b00
fcf246aa327f6384be94464b2c8aa0ef03af473d jdk8u212-b01
acab6dbdd0b55e524d50e9b1c4f12c90e2f424c5 jdk8u212-b02
ac2ef877d3e8062c1ce72757538daae6cad1118f jdk8u212-b03
01535393e060f2908b8733f2493344b636d1c515 jdk8u212-b04
ac2ef877d3e8062c1ce72757538daae6cad1118f jdk8u212-ga
src/share/classes/java/math/BigDecimal.java
浏览文件 @
3a9753ed
/*
* Copyright (c) 1996, 201
8
, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1996, 201
9
, 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
...
...
@@ -3060,9 +3060,32 @@ public class BigDecimal extends Number implements Comparable<BigDecimal> {
* @return this {@code BigDecimal} converted to a {@code long}.
*/
public
long
longValue
(){
return
(
intCompact
!=
INFLATED
&&
scale
==
0
)
?
intCompact:
toBigInteger
().
longValue
();
if
(
intCompact
!=
INFLATED
&&
scale
==
0
)
{
return
intCompact
;
}
else
{
// Fastpath zero and small values
if
(
this
.
signum
()
==
0
||
fractionOnly
()
||
// Fastpath very large-scale values that will result
// in a truncated value of zero. If the scale is -64
// or less, there are at least 64 powers of 10 in the
// value of the numerical result. Since 10 = 2*5, in
// that case there would also be 64 powers of 2 in the
// result, meaning all 64 bits of a long will be zero.
scale
<=
-
64
)
{
return
0
;
}
else
{
return
toBigInteger
().
longValue
();
}
}
}
/**
* Return true if a nonzero BigDecimal has an absolute value less
* than one; i.e. only has fraction digits.
*/
private
boolean
fractionOnly
()
{
assert
this
.
signum
()
!=
0
;
return
(
this
.
precision
()
-
this
.
scale
)
<=
0
;
}
/**
...
...
@@ -3080,15 +3103,20 @@ public class BigDecimal extends Number implements Comparable<BigDecimal> {
public
long
longValueExact
()
{
if
(
intCompact
!=
INFLATED
&&
scale
==
0
)
return
intCompact
;
// If more than 19 digits in integer part it cannot possibly fit
if
((
precision
()
-
scale
)
>
19
)
// [OK for negative scale too]
throw
new
java
.
lang
.
ArithmeticException
(
"Overflow"
);
// Fastpath zero and < 1.0 numbers (the latter can be very slow
// to round if very small)
// Fastpath zero
if
(
this
.
signum
()
==
0
)
return
0
;
if
((
this
.
precision
()
-
this
.
scale
)
<=
0
)
// Fastpath numbers less than 1.0 (the latter can be very slow
// to round if very small)
if
(
fractionOnly
())
throw
new
ArithmeticException
(
"Rounding necessary"
);
// If more than 19 digits in integer part it cannot possibly fit
if
((
precision
()
-
scale
)
>
19
)
// [OK for negative scale too]
throw
new
java
.
lang
.
ArithmeticException
(
"Overflow"
);
// round to an integer, with Exception if decimal part non-0
BigDecimal
num
=
this
.
setScale
(
0
,
ROUND_UNNECESSARY
);
if
(
num
.
precision
()
>=
19
)
// need to check carefully
...
...
@@ -3130,7 +3158,7 @@ public class BigDecimal extends Number implements Comparable<BigDecimal> {
public
int
intValue
()
{
return
(
intCompact
!=
INFLATED
&&
scale
==
0
)
?
(
int
)
intCompact
:
toBigInteger
().
int
Value
();
(
int
)
long
Value
();
}
/**
...
...
src/share/classes/sun/rmi/registry/RegistryImpl_Skel.java
浏览文件 @
3a9753ed
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2017,
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
...
...
@@ -58,8 +58,24 @@ public final class RegistryImpl_Skel
public
void
dispatch
(
java
.
rmi
.
Remote
obj
,
java
.
rmi
.
server
.
RemoteCall
call
,
int
opnum
,
long
hash
)
throws
java
.
lang
.
Exception
{
if
(
hash
!=
interfaceHash
)
throw
new
java
.
rmi
.
server
.
SkeletonMismatchException
(
"interface hash mismatch"
);
if
(
opnum
<
0
)
{
if
(
hash
==
7583982177005850366L
)
{
opnum
=
0
;
}
else
if
(
hash
==
2571371476350237748L
)
{
opnum
=
1
;
}
else
if
(
hash
==
-
7538657168040752697L
)
{
opnum
=
2
;
}
else
if
(
hash
==
-
8381844669958460146L
)
{
opnum
=
3
;
}
else
if
(
hash
==
7305022919901907578L
)
{
opnum
=
4
;
}
else
{
throw
new
java
.
rmi
.
UnmarshalException
(
"invalid method hash"
);
}
}
else
{
if
(
hash
!=
interfaceHash
)
throw
new
java
.
rmi
.
server
.
SkeletonMismatchException
(
"interface hash mismatch"
);
}
sun
.
rmi
.
registry
.
RegistryImpl
server
=
(
sun
.
rmi
.
registry
.
RegistryImpl
)
obj
;
switch
(
opnum
)
{
...
...
src/share/classes/sun/rmi/server/UnicastServerRef.java
浏览文件 @
3a9753ed
/*
* Copyright (c) 1996, 201
6
, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1996, 201
9
, 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
...
...
@@ -40,6 +40,7 @@ import java.rmi.ServerError;
import
java.rmi.ServerException
;
import
java.rmi.UnmarshalException
;
import
java.rmi.server.ExportException
;
import
java.rmi.server.Operation
;
import
java.rmi.server.RemoteCall
;
import
java.rmi.server.RemoteRef
;
import
java.rmi.server.RemoteStub
;
...
...
@@ -295,15 +296,14 @@ public class UnicastServerRef extends UnicastRef
throw
new
UnmarshalException
(
"error unmarshalling call header"
,
readEx
);
}
if
(
num
>=
0
)
{
if
(
skel
!=
null
)
{
if
(
skel
!=
null
)
{
// If there is a skeleton, use it
oldDispatch
(
obj
,
call
,
num
);
return
;
}
else
{
throw
new
UnmarshalException
(
"skeleton class not found but required "
+
"for client version"
);
}
}
else
if
(
num
>=
0
){
throw
new
UnmarshalException
(
"skeleton class not found but required for client version"
);
}
try
{
op
=
in
.
readLong
();
...
...
@@ -429,8 +429,8 @@ public class UnicastServerRef extends UnicastRef
/**
* Handle server-side dispatch using the RMI 1.1 stub/skeleton
* protocol, given a non-negative operation number
that has
* already been read from the call stream.
* protocol, given a non-negative operation number
or negative method hash
*
that has
already been read from the call stream.
* Exceptions are handled by the caller to be sent to the remote client.
*
* @param obj the target remote object for the call
...
...
@@ -462,7 +462,8 @@ public class UnicastServerRef extends UnicastRef
}
// if calls are being logged, write out object id and operation
logCall
(
obj
,
skel
.
getOperations
()[
op
]);
Operation
[]
operations
=
skel
.
getOperations
();
logCall
(
obj
,
op
>=
0
&&
op
<
operations
.
length
?
operations
[
op
]
:
"op: "
+
op
);
unmarshalCustomCallData
(
in
);
// dispatch to skeleton for remote object
skel
.
dispatch
(
obj
,
call
,
op
,
hash
);
...
...
src/share/native/sun/font/layout/ContextualSubstSubtables.cpp
浏览文件 @
3a9753ed
...
...
@@ -67,7 +67,10 @@ void ContextualSubstitutionBase::applySubstitutionLookups(
le_uint16
lookupListIndex
=
SWAPW
(
substLookupRecordArrayPtr
[
subst
].
lookupListIndex
);
tempIterator
.
setCurrStreamPosition
(
position
);
tempIterator
.
next
(
sequenceIndex
);
if
(
!
tempIterator
.
next
(
sequenceIndex
))
{
success
=
LE_INTERNAL_ERROR
;
return
;
}
lookupProcessor
->
applySingleLookup
(
lookupListIndex
,
&
tempIterator
,
fontInstance
,
success
);
}
...
...
src/share/native/sun/font/layout/GlyphIterator.cpp
浏览文件 @
3a9753ed
...
...
@@ -224,6 +224,16 @@ void GlyphIterator::getCursiveExitPoint(LEPoint &exitPoint) const
void
GlyphIterator
::
setCurrGlyphID
(
TTGlyphID
glyphID
)
{
if
(
direction
<
0
)
{
if
(
position
<=
nextLimit
||
position
>=
prevLimit
)
{
return
;
}
}
else
{
if
(
position
<=
prevLimit
||
position
>=
nextLimit
)
{
return
;
}
}
LEGlyphID
glyph
=
glyphStorage
[
position
];
glyphStorage
[
position
]
=
LE_SET_GLYPH
(
glyph
,
glyphID
);
...
...
src/share/native/sun/font/layout/SubstitutionLookups.cpp
浏览文件 @
3a9753ed
...
...
@@ -67,7 +67,10 @@ void SubstitutionLookup::applySubstitutionLookups(
le_uint16
lookupListIndex
=
SWAPW
(
substLookupRecordArray
[
subst
].
lookupListIndex
);
tempIterator
.
setCurrStreamPosition
(
position
);
tempIterator
.
next
(
sequenceIndex
);
if
(
!
tempIterator
.
next
(
sequenceIndex
))
{
success
=
LE_INTERNAL_ERROR
;
return
;
}
lookupProcessor
->
applySingleLookup
(
lookupListIndex
,
&
tempIterator
,
fontInstance
,
success
);
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录