Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openanolis
dragonwell8_jdk
提交
8d22cdf3
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,发现更多精彩内容 >>
提交
8d22cdf3
编写于
3月 02, 2009
作者:
T
tbell
浏览文件
操作
浏览文件
下载
差异文件
Merge
上级
e17532f6
16eb50ac
变更
13
显示空白变更内容
内联
并排
Showing
13 changed file
with
166 addition
and
21 deletion
+166
-21
make/common/shared/Defs-java.gmk
make/common/shared/Defs-java.gmk
+5
-0
make/docs/Makefile
make/docs/Makefile
+1
-0
make/javax/swing/beaninfo/SwingBeans.gmk
make/javax/swing/beaninfo/SwingBeans.gmk
+1
-1
src/share/classes/com/sun/servicetag/resources/register.html
src/share/classes/com/sun/servicetag/resources/register.html
+1
-1
src/share/classes/com/sun/servicetag/resources/register_ja.html
...are/classes/com/sun/servicetag/resources/register_ja.html
+1
-1
src/share/classes/com/sun/servicetag/resources/register_zh_CN.html
.../classes/com/sun/servicetag/resources/register_zh_CN.html
+1
-1
src/share/classes/java/security/Permission.java
src/share/classes/java/security/Permission.java
+6
-6
src/share/classes/java/util/concurrent/locks/AbstractQueuedLongSynchronizer.java
...util/concurrent/locks/AbstractQueuedLongSynchronizer.java
+4
-2
src/share/classes/java/util/concurrent/locks/AbstractQueuedSynchronizer.java
...ava/util/concurrent/locks/AbstractQueuedSynchronizer.java
+4
-2
src/share/classes/sun/launcher/LauncherHelper.java
src/share/classes/sun/launcher/LauncherHelper.java
+10
-5
src/share/classes/sun/misc/FloatingDecimal.java
src/share/classes/sun/misc/FloatingDecimal.java
+8
-2
test/java/security/Permission/ToString.java
test/java/security/Permission/ToString.java
+101
-0
test/java/util/zip/ZipFile/LargeZipFile.java
test/java/util/zip/ZipFile/LargeZipFile.java
+23
-0
未找到文件。
make/common/shared/Defs-java.gmk
浏览文件 @
8d22cdf3
...
...
@@ -129,6 +129,9 @@ JAVACFLAGS += $(OTHER_JAVACFLAGS)
# Needed for javah
JAVAHFLAGS += -bootclasspath $(CLASSBINDIR)
# Needed for JAVADOC and BOOT_JAVACFLAGS
NO_PROPRIETARY_API_WARNINGS = -XDignore.symbol.file=true
# Langtools
ifdef LANGTOOLS_DIST
JAVAC_JAR = $(LANGTOOLS_DIST)/bootstrap/lib/javac.jar
...
...
@@ -192,6 +195,8 @@ endif
BOOT_JAVACFLAGS += -encoding ascii
BOOT_JAR_JFLAGS += $(JAR_JFLAGS)
BOOT_JAVACFLAGS += $(NO_PROPRIETARY_API_WARNINGS)
BOOT_JAVA_CMD = $(BOOTDIR)/bin/java $(JAVA_TOOLS_FLAGS)
BOOT_JAVAC_CMD = $(BOOTDIR)/bin/javac $(JAVAC_JVM_FLAGS) $(BOOT_JAVACFLAGS)
BOOT_JAR_CMD = $(BOOTDIR)/bin/jar
...
...
make/docs/Makefile
浏览文件 @
8d22cdf3
...
...
@@ -45,6 +45,7 @@ endif
DOCSTMPDIR
=
$(TEMPDIR)
/doctmp
COMMON_JAVADOCFLAGS
=
\
$(NO_PROPRIETARY_API_WARNINGS)
\
-source
1.5
\
-quiet
\
-use
\
...
...
make/javax/swing/beaninfo/SwingBeans.gmk
浏览文件 @
8d22cdf3
...
...
@@ -47,7 +47,7 @@ swing-1.2-beans-debug:
LOCAL_JAVADOC = $(JAVADOC_CMD) $(JAVADOCFLAGS)
# get the absolute path to the jar command.
PREFIX = 1.2
JAVADOCFLAGS = $(LANGUAGE_VERSION)
JAVADOCFLAGS = $(
NO_PROPRIETARY_API_WARNINGS) $(
LANGUAGE_VERSION)
SWINGPKG = javax/swing
LOCAL_JAVAC_FLAGS = $(OTHER_JAVACFLAGS)
...
...
src/share/classes/com/sun/servicetag/resources/register.html
浏览文件 @
8d22cdf3
...
...
@@ -68,7 +68,7 @@ a:visited,a:visited code{color:#917E9C}
<table
width=
"708"
border=
"0"
cellspacing=
"0"
cellpadding=
"3"
>
<tr
valign=
"top"
>
<td
width=
"126"
height=
"35"
>
<form
name=
"form1"
method=
"post"
action=
"@@REGISTRATION_URL@@"
enctype=
"text/xml"
>
<form
name=
"form1"
method=
"post"
action=
"@@REGISTRATION_URL@@"
>
<input
type=
"hidden"
name=
"servicetag_payload"
value=
"@@REGISTRATION_PAYLOAD@@"
>
<input
type=
"submit"
name=
"Submit"
border=
"0"
class=
"buttonblue"
onmouseover=
"this.style.color='#fbe249';"
onmouseout=
"this.style.color='#FFF';"
value=
"Register My JDK"
>
</form></td>
...
...
src/share/classes/com/sun/servicetag/resources/register_ja.html
浏览文件 @
8d22cdf3
...
...
@@ -62,7 +62,7 @@ a:visited,a:visited code{color:#917E9C}
<p
class=
"style1"
>
必要になるのは、Sun 開発者向けネットワークアカウントまたはその他の Sun オンラインアカウントだけです。 まだアカウントがない場合は、アカウントの作成が求められます。
</p>
<table
width=
"708"
border=
"0"
cellspacing=
"0"
cellpadding=
"3"
>
<tr
valign=
"top"
>
<td
width=
"126"
height=
"35"
><form
name=
"form1"
method=
"post"
action=
"@@REGISTRATION_URL@@"
enctype=
"text/xml"
>
<td
width=
"126"
height=
"35"
><form
name=
"form1"
method=
"post"
action=
"@@REGISTRATION_URL@@"
>
<input
type=
"hidden"
name=
"servicetag_payload"
value=
"@@REGISTRATION_PAYLOAD@@"
>
<input
type=
"submit"
name=
"Submit"
border=
"0"
class=
"buttonblue"
onmouseover=
"this.style.color='#fbe249';"
onmouseout=
"this.style.color='#FFF';"
value=
"JDK 製品登録"
>
</form></td>
...
...
src/share/classes/com/sun/servicetag/resources/register_zh_CN.html
浏览文件 @
8d22cdf3
...
...
@@ -63,7 +63,7 @@ a:visited,a:visited code{color:#917E9C}
<p
class=
"style1"
>
您需要具有 Sun 开发者网络或其他 Sun 联机帐户。如果您没有,系统将提示您创建一个。
</p>
<table
width=
"708"
border=
"0"
cellspacing=
"0"
cellpadding=
"3"
>
<tr
valign=
"top"
>
<td
width=
"126"
height=
"35"
><form
name=
"form1"
method=
"post"
action=
"@@REGISTRATION_URL@@"
enctype=
"text/xml"
>
<td
width=
"126"
height=
"35"
><form
name=
"form1"
method=
"post"
action=
"@@REGISTRATION_URL@@"
>
<input
type=
"hidden"
name=
"servicetag_payload"
value=
"@@REGISTRATION_PAYLOAD@@"
>
<input
type=
"submit"
name=
"Submit"
border=
"0"
class=
"buttonblue"
onmouseover=
"this.style.color='#fbe249';"
onmouseout=
"this.style.color='#FFF';"
value=
"注册我的 JDK"
>
</form></td>
...
...
src/share/classes/java/security/Permission.java
浏览文件 @
8d22cdf3
/*
* Copyright 1997-200
3
Sun Microsystems, Inc. All Rights Reserved.
* Copyright 1997-200
9
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
...
...
@@ -214,18 +214,18 @@ public abstract class Permission implements Guard, java.io.Serializable {
/**
* Returns a string describing this Permission. The convention is to
* specify the class name, the permission name, and the actions in
* the following format: '("ClassName" "name" "actions")'.
* the following format: '("ClassName" "name" "actions")', or
* '("ClassName" "name")' if actions list is null or empty.
*
* @return information about this Permission.
*/
public
String
toString
()
{
String
actions
=
getActions
();
if
((
actions
==
null
)
||
(
actions
.
length
()
==
0
))
{
// OPTIONAL
return
"(
"
+
getClass
().
getName
()
+
" "
+
name
+
")"
;
return
"(
\""
+
getClass
().
getName
()
+
"\" \""
+
name
+
"\
")"
;
}
else
{
return
"(
"
+
getClass
().
getName
()
+
" "
+
name
+
" "
+
actions
+
")"
;
return
"(
\""
+
getClass
().
getName
()
+
"\" \""
+
name
+
"\" \""
+
actions
+
"\
")"
;
}
}
}
src/share/classes/java/util/concurrent/locks/AbstractQueuedLongSynchronizer.java
浏览文件 @
8d22cdf3
...
...
@@ -1222,8 +1222,10 @@ public abstract class AbstractQueuedLongSynchronizer
// The correctness of this depends on head being initialized
// before tail and on head.next being accurate if the current
// thread is first in queue.
Node
h
,
s
;
return
(
h
=
head
)
!=
tail
&&
Node
t
=
tail
;
// Read fields in reverse initialization order
Node
h
=
head
;
Node
s
;
return
h
!=
t
&&
((
s
=
h
.
next
)
==
null
||
s
.
thread
!=
Thread
.
currentThread
());
}
...
...
src/share/classes/java/util/concurrent/locks/AbstractQueuedSynchronizer.java
浏览文件 @
8d22cdf3
...
...
@@ -1445,8 +1445,10 @@ public abstract class AbstractQueuedSynchronizer
// The correctness of this depends on head being initialized
// before tail and on head.next being accurate if the current
// thread is first in queue.
Node
h
,
s
;
return
(
h
=
head
)
!=
tail
&&
Node
t
=
tail
;
// Read fields in reverse initialization order
Node
h
=
head
;
Node
s
;
return
h
!=
t
&&
((
s
=
h
.
next
)
==
null
||
s
.
thread
!=
Thread
.
currentThread
());
}
...
...
src/share/classes/sun/launcher/LauncherHelper.java
浏览文件 @
8d22cdf3
/*
* Copyright 2007-200
8
Sun Microsystems, Inc. All Rights Reserved.
* Copyright 2007-200
9
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
...
...
@@ -55,18 +54,24 @@ public enum LauncherHelper {
INSTANCE
;
private
static
final
String
defaultBundleName
=
"sun.launcher.resources.launcher"
;
private
static
ResourceBundle
javarb
=
ResourceBundle
.
getBundle
(
defaultBundleName
);
private
static
final
String
MAIN_CLASS
=
"Main-Class"
;
private
static
StringBuilder
outBuf
=
new
StringBuilder
();
private
static
ResourceBundle
javarb
=
null
;
private
static
synchronized
ResourceBundle
getLauncherResourceBundle
()
{
if
(
javarb
==
null
)
{
javarb
=
ResourceBundle
.
getBundle
(
defaultBundleName
);
}
return
javarb
;
}
/**
* A private helper method to get a localized message and also
* apply any arguments that we might pass.
*/
private
static
String
getLocalizedMessage
(
String
key
,
Object
...
args
)
{
String
msg
=
javarb
.
getString
(
key
);
String
msg
=
getLauncherResourceBundle
()
.
getString
(
key
);
return
(
args
!=
null
)
?
MessageFormat
.
format
(
msg
,
args
)
:
msg
;
}
...
...
src/share/classes/sun/misc/FloatingDecimal.java
浏览文件 @
8d22cdf3
...
...
@@ -1867,10 +1867,16 @@ public class FloatingDecimal{
* Grammar is compatible with hexadecimal floating-point constants
* described in section 6.4.4.2 of the C99 specification.
*/
private
static
Pattern
hexFloatPattern
=
Pattern
.
compile
(
private
static
Pattern
hexFloatPattern
=
null
;
private
static
synchronized
Pattern
getHexFloatPattern
()
{
if
(
hexFloatPattern
==
null
)
{
hexFloatPattern
=
Pattern
.
compile
(
//1 234 56 7 8 9
"([-+])?0[xX](((\\p{XDigit}+)\\.?)|((\\p{XDigit}*)\\.(\\p{XDigit}+)))[pP]([-+])?(\\p{Digit}+)[fFdD]?"
);
}
return
hexFloatPattern
;
}
/*
* Convert string s to a suitable floating decimal; uses the
...
...
@@ -1880,7 +1886,7 @@ public class FloatingDecimal{
static
FloatingDecimal
parseHexString
(
String
s
)
{
// Verify string is a member of the hexadecimal floating-point
// string language.
Matcher
m
=
hexFloatPattern
.
matcher
(
s
);
Matcher
m
=
getHexFloatPattern
()
.
matcher
(
s
);
boolean
validInput
=
m
.
matches
();
if
(!
validInput
)
{
...
...
test/java/security/Permission/ToString.java
0 → 100644
浏览文件 @
8d22cdf3
/*
* Copyright 2009 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 6549506
* @summary Specification of Permission.toString() method contradicts with
* JDK implementation
*/
import
java.security.*
;
public
class
ToString
{
public
static
void
main
(
String
[]
args
)
throws
Exception
{
DummyWritePermission
dummyPerm
=
new
DummyWritePermission
();
NullActionPermission
nullActionPerm
=
new
NullActionPermission
();
System
.
out
.
println
(
dummyPerm
.
toString
());
System
.
out
.
println
(
dummyPerm
.
getDescription
());
System
.
out
.
println
(
nullActionPerm
.
toString
());
System
.
out
.
println
(
nullActionPerm
.
getDescription
());
if
(!
dummyPerm
.
toString
().
equals
(
dummyPerm
.
getDescription
()))
{
throw
new
Exception
(
"The expected permission.toString() is "
+
dummyPerm
.
getDescription
()
+
", but "
+
dummyPerm
.
toString
()
+
" returned!"
);
}
if
(!
nullActionPerm
.
toString
().
equals
(
nullActionPerm
.
getDescription
()))
{
throw
new
Exception
(
"The expected permission.toString() is "
+
nullActionPerm
.
getDescription
()
+
", but "
+
nullActionPerm
.
toString
()
+
" returned!"
);
}
}
private
static
abstract
class
SimplePermission
extends
Permission
{
public
SimplePermission
(
String
name
)
{
super
(
name
);
}
public
boolean
implies
(
Permission
permission
)
{
return
false
;
}
public
boolean
equals
(
Object
obj
)
{
return
false
;
}
public
int
hashCode
()
{
return
13
;
}
}
private
static
class
DummyWritePermission
extends
SimplePermission
{
public
DummyWritePermission
()
{
super
(
"permit to"
);
}
public
String
getActions
()
{
return
"write"
;
}
public
String
getDescription
()
{
return
"(\"ToString$DummyWritePermission\" \"permit to\" \"write\")"
;
}
}
private
static
class
NullActionPermission
extends
SimplePermission
{
public
NullActionPermission
()
{
super
(
"permit to"
);
}
public
String
getActions
()
{
return
null
;
}
public
String
getDescription
()
{
return
"(\"ToString$NullActionPermission\" \"permit to\")"
;
}
}
}
test/java/util/zip/ZipFile/LargeZipFile.java
浏览文件 @
8d22cdf3
/*
* Copyright 2009 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.
*/
import
java.io.*
;
import
java.nio.*
;
import
java.util.*
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录