Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openanolis
dragonwell8_jdk
提交
b93a5ca6
D
dragonwell8_jdk
项目概览
openanolis
/
dragonwell8_jdk
通知
4
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看板
提交
b93a5ca6
编写于
10月 15, 2009
作者:
T
tbell
浏览文件
操作
浏览文件
下载
差异文件
Merge
上级
a64eb15d
8f1b1026
变更
26
显示空白变更内容
内联
并排
Showing
26 changed file
with
740 addition
and
33 deletion
+740
-33
make/java/java/FILES_java.gmk
make/java/java/FILES_java.gmk
+1
-0
src/share/classes/com/sun/naming/internal/ResourceManager.java
...hare/classes/com/sun/naming/internal/ResourceManager.java
+50
-3
src/share/classes/java/io/FilePermission.java
src/share/classes/java/io/FilePermission.java
+11
-1
src/share/classes/java/lang/Enum.java
src/share/classes/java/lang/Enum.java
+7
-0
src/share/classes/java/lang/reflect/AccessibleObject.java
src/share/classes/java/lang/reflect/AccessibleObject.java
+2
-0
src/share/classes/java/util/Objects.java
src/share/classes/java/util/Objects.java
+110
-0
src/share/classes/java/util/jar/JarVerifier.java
src/share/classes/java/util/jar/JarVerifier.java
+1
-3
src/share/classes/sun/misc/FloatingDecimal.java
src/share/classes/sun/misc/FloatingDecimal.java
+3
-3
src/share/classes/sun/net/httpserver/ExchangeImpl.java
src/share/classes/sun/net/httpserver/ExchangeImpl.java
+16
-0
src/share/classes/sun/net/www/protocol/http/HttpURLConnection.java
.../classes/sun/net/www/protocol/http/HttpURLConnection.java
+4
-0
src/share/classes/sun/security/provider/PolicyFile.java
src/share/classes/sun/security/provider/PolicyFile.java
+3
-2
src/share/classes/sun/security/provider/SunEntries.java
src/share/classes/sun/security/provider/SunEntries.java
+1
-1
src/share/classes/sun/security/provider/certpath/CertStoreHelper.java
...asses/sun/security/provider/certpath/CertStoreHelper.java
+68
-0
src/share/classes/sun/security/provider/certpath/OCSP.java
src/share/classes/sun/security/provider/certpath/OCSP.java
+4
-0
src/share/classes/sun/security/provider/certpath/OCSPChecker.java
...e/classes/sun/security/provider/certpath/OCSPChecker.java
+4
-4
src/share/classes/sun/security/provider/certpath/URICertStore.java
.../classes/sun/security/provider/certpath/URICertStore.java
+33
-5
src/share/classes/sun/security/provider/certpath/ldap/LDAPCertStore.java
...es/sun/security/provider/certpath/ldap/LDAPCertStore.java
+2
-1
src/share/classes/sun/security/provider/certpath/ldap/LDAPCertStoreHelper.java
.../security/provider/certpath/ldap/LDAPCertStoreHelper.java
+73
-0
src/solaris/classes/sun/nio/fs/SolarisAclFileAttributeView.java
...laris/classes/sun/nio/fs/SolarisAclFileAttributeView.java
+5
-5
test/com/sun/net/httpserver/bugs/B6886436.java
test/com/sun/net/httpserver/bugs/B6886436.java
+93
-0
test/java/lang/Double/ToString.java
test/java/lang/Double/ToString.java
+39
-0
test/java/lang/management/RuntimeMXBean/GetSystemProperties.java
...va/lang/management/RuntimeMXBean/GetSystemProperties.java
+19
-1
test/java/lang/management/RuntimeMXBean/PropertiesTest.java
test/java/lang/management/RuntimeMXBean/PropertiesTest.java
+16
-3
test/java/lang/reflect/DefaultAccessibility.java
test/java/lang/reflect/DefaultAccessibility.java
+69
-0
test/java/nio/file/attribute/AclFileAttributeView/Basic.java
test/java/nio/file/attribute/AclFileAttributeView/Basic.java
+1
-1
test/java/util/Objects/BasicObjectsTest.java
test/java/util/Objects/BasicObjectsTest.java
+105
-0
未找到文件。
make/java/java/FILES_java.gmk
浏览文件 @
b93a5ca6
...
...
@@ -258,6 +258,7 @@ JAVA_JAVA_java = \
java/util/ServiceConfigurationError.java \
java/util/Timer.java \
java/util/TimerTask.java \
java/util/Objects.java \
java/util/UUID.java \
java/util/concurrent/AbstractExecutorService.java \
java/util/concurrent/ArrayBlockingQueue.java \
...
...
src/share/classes/com/sun/naming/internal/ResourceManager.java
浏览文件 @
b93a5ca6
...
...
@@ -25,11 +25,12 @@
package
com.sun.naming.internal
;
import
java.applet.Applet
;
import
java.io.InputStream
;
import
java.io.IOException
;
import
java.net.URL
;
import
java.lang.ref.WeakReference
;
import
java.lang.reflect.Method
;
import
java.lang.reflect.InvocationTargetException
;
import
java.util.Enumeration
;
import
java.util.HashMap
;
import
java.util.Hashtable
;
...
...
@@ -112,6 +113,52 @@ public final class ResourceManager {
private
static
final
WeakHashMap
urlFactoryCache
=
new
WeakHashMap
(
11
);
private
static
final
WeakReference
NO_FACTORY
=
new
WeakReference
(
null
);
/**
* A class to allow JNDI properties be specified as applet parameters
* without creating a static dependency on java.applet.
*/
private
static
class
AppletParameter
{
private
static
final
Class
<?>
clazz
=
getClass
(
"java.applet.Applet"
);
private
static
final
Method
getMethod
=
getMethod
(
clazz
,
"getParameter"
,
String
.
class
);
private
static
Class
<?>
getClass
(
String
name
)
{
try
{
return
Class
.
forName
(
name
,
true
,
null
);
}
catch
(
ClassNotFoundException
e
)
{
return
null
;
}
}
private
static
Method
getMethod
(
Class
<?>
clazz
,
String
name
,
Class
<?>...
paramTypes
)
{
if
(
clazz
!=
null
)
{
try
{
return
clazz
.
getMethod
(
name
,
paramTypes
);
}
catch
(
NoSuchMethodException
e
)
{
throw
new
AssertionError
(
e
);
}
}
else
{
return
null
;
}
}
/**
* Returns the value of the applet's named parameter.
*/
static
Object
get
(
Object
applet
,
String
name
)
{
// if clazz is null then applet cannot be an Applet.
if
(
clazz
==
null
||
!
clazz
.
isInstance
(
applet
))
throw
new
ClassCastException
(
applet
.
getClass
().
getName
());
try
{
return
getMethod
.
invoke
(
applet
,
name
);
}
catch
(
InvocationTargetException
e
)
{
throw
new
AssertionError
(
e
);
}
catch
(
IllegalAccessException
iae
)
{
throw
new
AssertionError
(
iae
);
}
}
}
// There should be no instances of this class.
private
ResourceManager
()
{
...
...
@@ -143,7 +190,7 @@ public final class ResourceManager {
if
(
env
==
null
)
{
env
=
new
Hashtable
(
11
);
}
Applet
applet
=
(
Applet
)
env
.
get
(
Context
.
APPLET
);
Object
applet
=
env
.
get
(
Context
.
APPLET
);
// Merge property values from env param, applet params, and system
// properties. The first value wins: there's no concatenation of
...
...
@@ -157,7 +204,7 @@ public final class ResourceManager {
Object
val
=
env
.
get
(
props
[
i
]);
if
(
val
==
null
)
{
if
(
applet
!=
null
)
{
val
=
applet
.
getParameter
(
props
[
i
]);
val
=
AppletParameter
.
get
(
applet
,
props
[
i
]);
}
if
(
val
==
null
)
{
// Read system property.
...
...
src/share/classes/java/io/FilePermission.java
浏览文件 @
b93a5ca6
...
...
@@ -209,7 +209,17 @@ public final class FilePermission extends Permission implements Serializable {
cpath
=
AccessController
.
doPrivileged
(
new
PrivilegedAction
<
String
>()
{
public
String
run
()
{
try
{
return
sun
.
security
.
provider
.
PolicyFile
.
canonPath
(
cpath
);
String
path
=
cpath
;
if
(
cpath
.
endsWith
(
"*"
))
{
// call getCanonicalPath with a path with wildcard character
// replaced to avoid calling it with paths that are
// intended to match all entries in a directory
path
=
path
.
substring
(
0
,
path
.
length
()-
1
)
+
"-"
;
path
=
new
File
(
path
).
getCanonicalPath
();
return
path
.
substring
(
0
,
path
.
length
()-
1
)
+
"*"
;
}
else
{
return
new
File
(
path
).
getCanonicalPath
();
}
}
catch
(
IOException
ioe
)
{
return
cpath
;
}
...
...
src/share/classes/java/lang/Enum.java
浏览文件 @
b93a5ca6
...
...
@@ -40,10 +40,17 @@ import java.io.ObjectStreamException;
* Edition</i>, <a
* href="http://java.sun.com/docs/books/jls/third_edition/html/classes.html#8.9">§8.9</a>.
*
* <p> Note that when using an enumeration type as the type of a set
* or as the type of the keys in a map, specialized and efficient
* {@linkplain java.util.EnumSet set} and {@linkplain
* java.util.EnumMap map} implementations are available.
*
* @param <E> The enum type subclass
* @author Josh Bloch
* @author Neal Gafter
* @see Class#getEnumConstants()
* @see java.util.EnumSet
* @see java.util.EnumMap
* @since 1.5
*/
public
abstract
class
Enum
<
E
extends
Enum
<
E
>>
...
...
src/share/classes/java/lang/reflect/AccessibleObject.java
浏览文件 @
b93a5ca6
...
...
@@ -44,6 +44,8 @@ import java.lang.annotation.Annotation;
* as Java Object Serialization or other persistence mechanisms, to
* manipulate objects in a manner that would normally be prohibited.
*
* <p>By default, a reflected object is <em>not</em> accessible.
*
* @see Field
* @see Method
* @see Constructor
...
...
src/share/classes/java/util/Objects.java
0 → 100644
浏览文件 @
b93a5ca6
/*
* 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. Sun designates this
* particular file as subject to the "Classpath" exception as provided
* by Sun in the LICENSE file that accompanied this code.
*
* 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.
*/
package
java.util
;
/**
* This class consists of {@code static} utility methods for operating
* on objects. These utilities include {@code null}-safe or {@code
* null}-tolerant methods for computing the hash code of an object,
* returning a string for an object, and comparing two objects.
*
* @since 1.7
*/
public
class
Objects
{
private
Objects
()
{
throw
new
AssertionError
(
"No java.util.Objects instances for you!"
);
}
/**
* Returns {@code true} if the arguments are equal to each other
* and {@code false} otherwise.
* Consequently, if both arguments are {@code null}, {@code true}
* is returned and if exactly one argument is {@code null}, {@code
* false} is returned. Otherwise, equality is determined by using
* the {@link Object#equals equals} method of the first
* argument.
*
* @param a an object
* @param b an object to be compared with {@code a} for equality
* @return {@code true} if the arguments are equal to each other
* and {@code false} otherwise
* @see Object#equals(Object)
*/
public
static
boolean
equals
(
Object
a
,
Object
b
)
{
return
(
a
==
b
)
||
(
a
!=
null
&&
a
.
equals
(
b
));
}
/**
* Returns the hash code of a non-{@code null} argument and 0 for
* a {@code null} argument.
*
* @param o an object
* @return the hash code of a non-{@code null} argument and 0 for
* a {@code null} argument
* @see Object#hashCode
*/
public
static
int
hashCode
(
Object
o
)
{
return
o
!=
null
?
o
.
hashCode
()
:
0
;
}
/**
* Returns the result of calling {@code toString} for a non-{@code
* null} argument and {@code "null"} for a {@code null} argument.
*
* @param o an object
* @return the result of calling {@code toString} for a non-{@code
* null} argument and {@code "null"} for a {@code null} argument
* @see Object#toString
* @see String#valueOf(Object)
*/
public
static
String
toString
(
Object
o
)
{
return
String
.
valueOf
(
o
);
}
/**
* Returns 0 if the arguments are identical and {@code
* c.compare(a, b)} otherwise.
* Consequently, if both arguments are {@code null} 0
* is returned.
*
* <p>Note that if one of the arguments is {@code null}, a {@code
* NullPointerException} may or may not be thrown depending on
* what ordering policy, if any, the {@link Comparator Comparator}
* chooses to have for {@code null} values.
*
* @param <T> the type of the objects being compared
* @param a an object
* @param b an object to be compared with {@code a}
* @param c the {@code Comparator} to compare the first two arguments
* @return 0 if the arguments are identical and {@code
* c.compare(a, b)} otherwise.
* @see Comparable
* @see Comparator
*/
public
static
<
T
>
int
compare
(
T
a
,
T
b
,
Comparator
<?
super
T
>
c
)
{
return
(
a
==
b
)
?
0
:
c
.
compare
(
a
,
b
);
}
}
src/share/classes/java/util/jar/JarVerifier.java
浏览文件 @
b93a5ca6
...
...
@@ -293,10 +293,8 @@ class JarVerifier {
}
sfv
.
process
(
sigFileSigners
);
}
catch
(
sun
.
security
.
pkcs
.
ParsingException
pe
)
{
if
(
debug
!=
null
)
debug
.
println
(
"processEntry caught: "
+
pe
);
// ignore and treat as unsigned
}
catch
(
IOException
ioe
)
{
// e.g. sun.security.pkcs.ParsingException
if
(
debug
!=
null
)
debug
.
println
(
"processEntry caught: "
+
ioe
);
// ignore and treat as unsigned
}
catch
(
SignatureException
se
)
{
...
...
src/share/classes/sun/misc/FloatingDecimal.java
浏览文件 @
b93a5ca6
...
...
@@ -730,7 +730,7 @@ public class FloatingDecimal{
* Thus we will need more than one digit if we're using
* E-form
*/
if
(
decExp
<
=
-
3
||
decExp
>=
8
){
if
(
decExp
<
-
3
||
decExp
>=
8
){
high
=
low
=
false
;
}
while
(
!
low
&&
!
high
){
...
...
@@ -783,7 +783,7 @@ public class FloatingDecimal{
* Thus we will need more than one digit if we're using
* E-form
*/
if
(
decExp
<
=
-
3
||
decExp
>=
8
){
if
(
decExp
<
-
3
||
decExp
>=
8
){
high
=
low
=
false
;
}
while
(
!
low
&&
!
high
){
...
...
@@ -847,7 +847,7 @@ public class FloatingDecimal{
* Thus we will need more than one digit if we're using
* E-form
*/
if
(
decExp
<
=
-
3
||
decExp
>=
8
){
if
(
decExp
<
-
3
||
decExp
>=
8
){
high
=
low
=
false
;
}
while
(
!
low
&&
!
high
){
...
...
src/share/classes/sun/net/httpserver/ExchangeImpl.java
浏览文件 @
b93a5ca6
...
...
@@ -31,6 +31,7 @@ import java.nio.channels.*;
import
java.net.*
;
import
javax.net.ssl.*
;
import
java.util.*
;
import
java.util.logging.Logger
;
import
java.text.*
;
import
sun.net.www.MessageHeader
;
import
com.sun.net.httpserver.*
;
...
...
@@ -204,6 +205,21 @@ class ExchangeImpl {
tmpout
.
write
(
bytes
(
statusLine
,
0
),
0
,
statusLine
.
length
());
boolean
noContentToSend
=
false
;
// assume there is content
rspHdrs
.
set
(
"Date"
,
df
.
format
(
new
Date
()));
/* check for response type that is not allowed to send a body */
if
((
rCode
>=
100
&&
rCode
<
200
)
/* informational */
||(
rCode
==
204
)
/* no content */
||(
rCode
==
304
))
/* not modified */
{
if
(
contentLen
!=
-
1
)
{
Logger
logger
=
server
.
getLogger
();
String
msg
=
"sendResponseHeaders: rCode = "
+
rCode
+
": forcing contentLen = -1"
;
logger
.
warning
(
msg
);
}
contentLen
=
-
1
;
}
if
(
contentLen
==
0
)
{
if
(
http10
)
{
o
.
setWrappedStream
(
new
UndefLengthOutputStream
(
this
,
ros
));
...
...
src/share/classes/sun/net/www/protocol/http/HttpURLConnection.java
浏览文件 @
b93a5ca6
...
...
@@ -1180,6 +1180,10 @@ public class HttpURLConnection extends java.net.HttpURLConnection {
inputStream
=
http
.
getInputStream
();
respCode
=
getResponseCode
();
if
(
respCode
==
-
1
)
{
disconnectInternal
();
throw
new
IOException
(
"Invalid Http response"
);
}
if
(
respCode
==
HTTP_PROXY_AUTH
)
{
if
(
streaming
())
{
disconnectInternal
();
...
...
src/share/classes/sun/security/provider/PolicyFile.java
浏览文件 @
b93a5ca6
...
...
@@ -1832,8 +1832,9 @@ public class PolicyFile extends java.security.Policy {
return
canonCs
;
}
// public for java.io.FilePermission
public
static
String
canonPath
(
String
path
)
throws
IOException
{
// Wrapper to return a canonical path that avoids calling getCanonicalPath()
// with paths that are intended to match all entries in the directory
private
static
String
canonPath
(
String
path
)
throws
IOException
{
if
(
path
.
endsWith
(
"*"
))
{
path
=
path
.
substring
(
0
,
path
.
length
()-
1
)
+
"-"
;
path
=
new
File
(
path
).
getCanonicalPath
();
...
...
src/share/classes/sun/security/provider/SunEntries.java
浏览文件 @
b93a5ca6
...
...
@@ -210,7 +210,7 @@ final class SunEntries {
* CertStores
*/
map
.
put
(
"CertStore.LDAP"
,
"sun.security.provider.certpath.LDAPCertStore"
);
"sun.security.provider.certpath.
ldap.
LDAPCertStore"
);
map
.
put
(
"CertStore.LDAP LDAPSchema"
,
"RFC2587"
);
map
.
put
(
"CertStore.Collection"
,
"sun.security.provider.certpath.CollectionCertStore"
);
...
...
src/share/classes/sun/security/provider/certpath/CertStoreHelper.java
0 → 100644
浏览文件 @
b93a5ca6
/*
* 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. Sun designates this
* particular file as subject to the "Classpath" exception as provided
* by Sun in the LICENSE file that accompanied this code.
*
* 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.
*/
package
sun.security.provider.certpath
;
import
java.net.URI
;
import
java.util.Collection
;
import
java.security.NoSuchAlgorithmException
;
import
java.security.InvalidAlgorithmParameterException
;
import
java.security.cert.CertStore
;
import
java.security.cert.X509CertSelector
;
import
java.security.cert.X509CRLSelector
;
import
javax.security.auth.x500.X500Principal
;
import
java.io.IOException
;
/**
* Helper used by URICertStore when delegating to another CertStore to
* fetch certs and CRLs.
*/
public
interface
CertStoreHelper
{
/**
* Returns a CertStore using the given URI as parameters.
*/
CertStore
getCertStore
(
URI
uri
)
throws
NoSuchAlgorithmException
,
InvalidAlgorithmParameterException
;
/**
* Wraps an existing X509CertSelector when needing to avoid DN matching
* issues.
*/
X509CertSelector
wrap
(
X509CertSelector
selector
,
X500Principal
certSubject
,
String
dn
)
throws
IOException
;
/**
* Wraps an existing X509CRLSelector when needing to avoid DN matching
* issues.
*/
X509CRLSelector
wrap
(
X509CRLSelector
selector
,
Collection
<
X500Principal
>
certIssuers
,
String
dn
)
throws
IOException
;
}
src/share/classes/sun/security/provider/certpath/OCSP.java
浏览文件 @
b93a5ca6
...
...
@@ -64,6 +64,8 @@ public final class OCSP {
private
static
final
Debug
debug
=
Debug
.
getInstance
(
"certpath"
);
private
static
final
int
CONNECT_TIMEOUT
=
15000
;
// 15 seconds
private
OCSP
()
{}
/**
...
...
@@ -176,6 +178,8 @@ public final class OCSP {
debug
.
println
(
"connecting to OCSP service at: "
+
url
);
}
HttpURLConnection
con
=
(
HttpURLConnection
)
url
.
openConnection
();
con
.
setConnectTimeout
(
CONNECT_TIMEOUT
);
con
.
setReadTimeout
(
CONNECT_TIMEOUT
);
con
.
setDoOutput
(
true
);
con
.
setDoInput
(
true
);
con
.
setRequestMethod
(
"POST"
);
...
...
src/share/classes/sun/security/provider/certpath/OCSPChecker.java
浏览文件 @
b93a5ca6
...
...
@@ -25,7 +25,6 @@
package
sun.security.provider.certpath
;
import
java.io.IOException
;
import
java.math.BigInteger
;
import
java.util.*
;
import
java.security.AccessController
;
...
...
@@ -335,10 +334,11 @@ class OCSPChecker extends PKIXCertPathChecker {
(
issuerCert
,
currCertImpl
.
getSerialNumberObject
());
response
=
OCSP
.
check
(
Collections
.
singletonList
(
certId
),
uri
,
responderCert
,
pkixParams
.
getDate
());
}
catch
(
IOException
ioe
)
{
// should allow this to pass if network failures are acceptable
}
catch
(
Exception
e
)
{
// Wrap all exceptions in CertPathValidatorException so that
// we can fallback to CRLs, if enabled.
throw
new
CertPathValidatorException
(
"Unable to send OCSP request"
,
io
e
);
(
"Unable to send OCSP request"
,
e
);
}
RevocationStatus
rs
=
(
RevocationStatus
)
response
.
getSingleResponse
(
certId
);
...
...
src/share/classes/sun/security/provider/certpath/URICertStore.java
浏览文件 @
b93a5ca6
...
...
@@ -30,6 +30,8 @@ import java.io.IOException;
import
java.net.HttpURLConnection
;
import
java.net.URI
;
import
java.net.URLConnection
;
import
java.security.AccessController
;
import
java.security.PrivilegedAction
;
import
java.security.InvalidAlgorithmParameterException
;
import
java.security.NoSuchAlgorithmException
;
import
java.security.Provider
;
...
...
@@ -120,6 +122,32 @@ class URICertStore extends CertStoreSpi {
private
CertStore
ldapCertStore
;
private
String
ldapPath
;
/**
* Holder class to lazily load LDAPCertStoreHelper if present.
*/
private
static
class
LDAP
{
private
static
final
String
CERT_STORE_HELPER
=
"sun.security.provider.certpath.ldap.LDAPCertStoreHelper"
;
private
static
final
CertStoreHelper
helper
=
AccessController
.
doPrivileged
(
new
PrivilegedAction
<
CertStoreHelper
>()
{
public
CertStoreHelper
run
()
{
try
{
Class
<?>
c
=
Class
.
forName
(
CERT_STORE_HELPER
,
true
,
null
);
return
(
CertStoreHelper
)
c
.
newInstance
();
}
catch
(
ClassNotFoundException
cnf
)
{
return
null
;
}
catch
(
InstantiationException
e
)
{
throw
new
AssertionError
(
e
);
}
catch
(
IllegalAccessException
e
)
{
throw
new
AssertionError
(
e
);
}
}});
static
CertStoreHelper
helper
()
{
return
helper
;
}
}
/**
* Creates a URICertStore.
*
...
...
@@ -135,9 +163,10 @@ class URICertStore extends CertStoreSpi {
this
.
uri
=
((
URICertStoreParameters
)
params
).
uri
;
// if ldap URI, use an LDAPCertStore to fetch certs and CRLs
if
(
uri
.
getScheme
().
toLowerCase
().
equals
(
"ldap"
))
{
if
(
LDAP
.
helper
()
==
null
)
throw
new
NoSuchAlgorithmException
(
"LDAP not present"
);
ldap
=
true
;
ldapCertStore
=
LDAPCertStore
.
getInstance
(
LDAPCertStore
.
getParameters
(
uri
));
ldapCertStore
=
LDAP
.
helper
().
getCertStore
(
uri
);
ldapPath
=
uri
.
getPath
();
// strip off leading '/'
if
(
ldapPath
.
charAt
(
0
)
==
'/'
)
{
...
...
@@ -219,8 +248,7 @@ class URICertStore extends CertStoreSpi {
if
(
ldap
)
{
X509CertSelector
xsel
=
(
X509CertSelector
)
selector
;
try
{
xsel
=
new
LDAPCertStore
.
LDAPCertSelector
(
xsel
,
xsel
.
getSubject
(),
ldapPath
);
xsel
=
LDAP
.
helper
().
wrap
(
xsel
,
xsel
.
getSubject
(),
ldapPath
);
}
catch
(
IOException
ioe
)
{
throw
new
CertStoreException
(
ioe
);
}
...
...
@@ -340,7 +368,7 @@ class URICertStore extends CertStoreSpi {
if
(
ldap
)
{
X509CRLSelector
xsel
=
(
X509CRLSelector
)
selector
;
try
{
xsel
=
new
LDAPCertStore
.
LDAPCRLSelector
(
xsel
,
null
,
ldapPath
);
xsel
=
LDAP
.
helper
().
wrap
(
xsel
,
null
,
ldapPath
);
}
catch
(
IOException
ioe
)
{
throw
new
CertStoreException
(
ioe
);
}
...
...
src/share/classes/sun/security/provider/certpath/LDAPCertStore.java
→
src/share/classes/sun/security/provider/certpath/
ldap/
LDAPCertStore.java
浏览文件 @
b93a5ca6
...
...
@@ -23,7 +23,7 @@
* have any questions.
*/
package
sun.security.provider.certpath
;
package
sun.security.provider.certpath
.ldap
;
import
java.io.ByteArrayInputStream
;
import
java.io.IOException
;
...
...
@@ -46,6 +46,7 @@ import java.security.cert.*;
import
javax.security.auth.x500.X500Principal
;
import
sun.misc.HexDumpEncoder
;
import
sun.security.provider.certpath.X509CertificatePair
;
import
sun.security.util.Cache
;
import
sun.security.util.Debug
;
import
sun.security.x509.X500Name
;
...
...
src/share/classes/sun/security/provider/certpath/ldap/LDAPCertStoreHelper.java
0 → 100644
浏览文件 @
b93a5ca6
/*
* 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. Sun designates this
* particular file as subject to the "Classpath" exception as provided
* by Sun in the LICENSE file that accompanied this code.
*
* 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.
*/
package
sun.security.provider.certpath.ldap
;
import
java.net.URI
;
import
java.util.Collection
;
import
java.security.NoSuchAlgorithmException
;
import
java.security.InvalidAlgorithmParameterException
;
import
java.security.cert.CertStore
;
import
java.security.cert.X509CertSelector
;
import
java.security.cert.X509CRLSelector
;
import
javax.security.auth.x500.X500Principal
;
import
java.io.IOException
;
import
sun.security.provider.certpath.CertStoreHelper
;
/**
* LDAP implementation of CertStoreHelper.
*/
public
class
LDAPCertStoreHelper
implements
CertStoreHelper
{
public
LDAPCertStoreHelper
()
{
}
@Override
public
CertStore
getCertStore
(
URI
uri
)
throws
NoSuchAlgorithmException
,
InvalidAlgorithmParameterException
{
return
LDAPCertStore
.
getInstance
(
LDAPCertStore
.
getParameters
(
uri
));
}
@Override
public
X509CertSelector
wrap
(
X509CertSelector
selector
,
X500Principal
certSubject
,
String
ldapDN
)
throws
IOException
{
return
new
LDAPCertStore
.
LDAPCertSelector
(
selector
,
certSubject
,
ldapDN
);
}
@Override
public
X509CRLSelector
wrap
(
X509CRLSelector
selector
,
Collection
<
X500Principal
>
certIssuers
,
String
ldapDN
)
throws
IOException
{
return
new
LDAPCertStore
.
LDAPCRLSelector
(
selector
,
certIssuers
,
ldapDN
);
}
}
src/solaris/classes/sun/nio/fs/SolarisAclFileAttributeView.java
浏览文件 @
b93a5ca6
...
...
@@ -104,11 +104,11 @@ class SolarisAclFileAttributeView
int
uid
;
if
(
user
.
isSpecial
())
{
uid
=
-
1
;
if
(
who
.
getName
().
equals
(
UnixUserPrincipals
.
SPECIAL_OWNER
.
getName
())
)
if
(
who
==
UnixUserPrincipals
.
SPECIAL_OWNER
)
flags
|=
ACE_OWNER
;
else
if
(
who
.
getName
().
equals
(
UnixUserPrincipals
.
SPECIAL_GROUP
.
getName
())
)
flags
|=
ACE_GROUP
;
else
if
(
who
.
getName
().
equals
(
UnixUserPrincipals
.
SPECIAL_EVERYONE
.
getName
())
)
else
if
(
who
==
UnixUserPrincipals
.
SPECIAL_GROUP
)
flags
|=
(
ACE_GROUP
|
ACE_IDENTIFIER_GROUP
)
;
else
if
(
who
==
UnixUserPrincipals
.
SPECIAL_EVERYONE
)
flags
|=
ACE_EVERYONE
;
else
throw
new
AssertionError
(
"Unable to map special identifier"
);
...
...
@@ -281,7 +281,7 @@ class SolarisAclFileAttributeView
aceFlags
.
add
(
AclEntryFlag
.
DIRECTORY_INHERIT
);
if
((
flags
&
ACE_NO_PROPAGATE_INHERIT_ACE
)
>
0
)
aceFlags
.
add
(
AclEntryFlag
.
NO_PROPAGATE_INHERIT
);
if
((
flags
&
ACE_INHERIT_ONLY_ACE
)
>
0
)
if
((
flags
&
ACE_INHERIT_ONLY_ACE
)
>
0
)
aceFlags
.
add
(
AclEntryFlag
.
INHERIT_ONLY
);
// build the ACL entry and add it to the list
...
...
test/com/sun/net/httpserver/bugs/B6886436.java
0 → 100644
浏览文件 @
b93a5ca6
/*
* 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 6886436
* @summary
*/
import
com.sun.net.httpserver.*
;
import
java.util.*
;
import
java.util.concurrent.*
;
import
java.util.logging.*
;
import
java.io.*
;
import
java.net.*
;
public
class
B6886436
{
public
static
void
main
(
String
[]
args
)
throws
Exception
{
Logger
logger
=
Logger
.
getLogger
(
"com.sun.net.httpserver"
);
ConsoleHandler
c
=
new
ConsoleHandler
();
c
.
setLevel
(
Level
.
WARNING
);
logger
.
addHandler
(
c
);
logger
.
setLevel
(
Level
.
WARNING
);
Handler
handler
=
new
Handler
();
InetSocketAddress
addr
=
new
InetSocketAddress
(
0
);
HttpServer
server
=
HttpServer
.
create
(
addr
,
0
);
HttpContext
ctx
=
server
.
createContext
(
"/test"
,
handler
);
ExecutorService
executor
=
Executors
.
newCachedThreadPool
();
server
.
setExecutor
(
executor
);
server
.
start
();
URL
url
=
new
URL
(
"http://localhost:"
+
server
.
getAddress
().
getPort
()+
"/test/foo.html"
);
HttpURLConnection
urlc
=
(
HttpURLConnection
)
url
.
openConnection
();
try
{
InputStream
is
=
urlc
.
getInputStream
();
while
(
is
.
read
()!=
-
1
)
;
is
.
close
();
urlc
=
(
HttpURLConnection
)
url
.
openConnection
();
urlc
.
setReadTimeout
(
3000
);
is
=
urlc
.
getInputStream
();
while
(
is
.
read
()!=
-
1
);
is
.
close
();
}
catch
(
IOException
e
)
{
server
.
stop
(
2
);
executor
.
shutdown
();
throw
new
RuntimeException
(
"Test failed"
);
}
server
.
stop
(
2
);
executor
.
shutdown
();
System
.
out
.
println
(
"OK"
);
}
public
static
boolean
error
=
false
;
static
class
Handler
implements
HttpHandler
{
int
invocation
=
1
;
public
void
handle
(
HttpExchange
t
)
throws
IOException
{
InputStream
is
=
t
.
getRequestBody
();
Headers
map
=
t
.
getRequestHeaders
();
Headers
rmap
=
t
.
getResponseHeaders
();
while
(
is
.
read
()
!=
-
1
)
;
is
.
close
();
// send a 204 response with an empty chunked body
t
.
sendResponseHeaders
(
204
,
0
);
t
.
close
();
}
}
}
test/java/lang/Double/ToString.java
0 → 100644
浏览文件 @
b93a5ca6
/*
* 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 4428022
* @summary Tests for Double.toString
* @author Andrew Haley <aph@redhat.com>
*/
public
class
ToString
{
public
static
void
main
(
String
args
[])
{
if
(!
Double
.
toString
(
0.001
).
equals
(
"0.001"
))
throw
new
RuntimeException
(
"Double.toString(0.001) is not \"0.001\""
);
if
(!
Double
.
toString
(
0.002
).
equals
(
"0.002"
))
throw
new
RuntimeException
(
"Double.toString(0.001) is not \"0.002\""
);
}
}
test/java/lang/management/RuntimeMXBean/GetSystemProperties.java
浏览文件 @
b93a5ca6
...
...
@@ -49,6 +49,21 @@ public class GetSystemProperties {
private
static
final
String
VALUE4
=
"test.property.value4"
;
public
static
void
main
(
String
[]
argv
)
throws
Exception
{
// Save a copy of the original system properties
Properties
props
=
System
.
getProperties
();
try
{
// replace the system Properties object for any modification
// in case jtreg caches a copy
System
.
setProperties
(
new
Properties
(
props
));
runTest
();
}
finally
{
// restore original system properties
System
.
setProperties
(
props
);
}
}
private
static
void
runTest
()
throws
Exception
{
RuntimeMXBean
mbean
=
ManagementFactory
.
getRuntimeMXBean
();
// Print all system properties
...
...
@@ -88,7 +103,10 @@ public class GetSystemProperties {
Map
<
String
,
String
>
props2
=
mbean
.
getSystemProperties
();
// expect the system properties returned should be
// same as the one before adding KEY3 and KEY4
props1
.
equals
(
props2
);
if
(!
props1
.
equals
(
props2
))
{
throw
new
RuntimeException
(
"Two copies of system properties "
+
"are expected to be equal"
);
}
System
.
out
.
println
(
"Test passed."
);
}
...
...
test/java/lang/management/RuntimeMXBean/PropertiesTest.java
浏览文件 @
b93a5ca6
...
...
@@ -40,8 +40,21 @@ import java.lang.management.RuntimeMXBean;
public
class
PropertiesTest
{
private
static
int
NUM_MYPROPS
=
3
;
public
static
void
main
(
String
[]
argv
)
throws
Exception
{
Properties
sysProps
=
System
.
getProperties
();
// Save a copy of the original system properties
Properties
props
=
System
.
getProperties
();
try
{
// replace the system Properties object for any modification
// in case jtreg caches a copy
System
.
setProperties
(
new
Properties
(
props
));
runTest
(
props
.
size
());
}
finally
{
// restore original system properties
System
.
setProperties
(
props
);
}
}
private
static
void
runTest
(
int
sysPropsCount
)
throws
Exception
{
// Create a new system properties using the old one
// as the defaults
Properties
myProps
=
new
Properties
(
System
.
getProperties
()
);
...
...
@@ -65,10 +78,10 @@ public class PropertiesTest {
System
.
out
.
println
(
i
++
+
": "
+
key
+
" : "
+
value
);
}
if
(
props
.
size
()
!=
NUM_MYPROPS
+
sysProps
.
size
()
)
{
if
(
props
.
size
()
!=
NUM_MYPROPS
+
sysProps
Count
)
{
throw
new
RuntimeException
(
"Test Failed: "
+
"Expected number of properties = "
+
NUM_MYPROPS
+
sysProps
.
size
()
+
NUM_MYPROPS
+
sysProps
Count
+
" but found = "
+
props
.
size
());
}
}
...
...
test/java/lang/reflect/DefaultAccessibility.java
0 → 100644
浏览文件 @
b93a5ca6
/*
* 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 6648344
* @summary Test that default accessibility is false
* @author Joseph D. Darcy
*/
import
java.lang.reflect.*
;
public
class
DefaultAccessibility
{
private
DefaultAccessibility
()
{
super
();
}
private
static
int
f
=
42
;
public
static
void
main
(
String
...
args
)
throws
Exception
{
Class
<?>
daClass
=
(
new
DefaultAccessibility
()).
getClass
();
int
elementCount
=
0
;
for
(
Constructor
<?>
ctor
:
daClass
.
getDeclaredConstructors
())
{
elementCount
++;
if
(
ctor
.
isAccessible
())
throw
new
RuntimeException
(
"Unexpected accessibility for constructor "
+
ctor
);
}
for
(
Method
method
:
daClass
.
getDeclaredMethods
())
{
elementCount
++;
if
(
method
.
isAccessible
())
throw
new
RuntimeException
(
"Unexpected accessibility for method "
+
method
);
}
for
(
Field
field
:
daClass
.
getDeclaredFields
())
{
elementCount
++;
if
(
field
.
isAccessible
())
throw
new
RuntimeException
(
"Unexpected accessibility for field "
+
field
);
}
if
(
elementCount
<
3
)
throw
new
RuntimeException
(
"Expected at least three members; only found "
+
elementCount
);
}
}
test/java/nio/file/attribute/AclFileAttributeView/Basic.java
浏览文件 @
b93a5ca6
...
...
@@ -22,7 +22,7 @@
*/
/* @test
* @bug 4313887 6838333
* @bug 4313887 6838333
6891404
* @summary Unit test for java.nio.file.attribute.AclFileAttribueView
* @library ../..
*/
...
...
test/java/util/Objects/BasicObjectsTest.java
0 → 100644
浏览文件 @
b93a5ca6
/*
* 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 6797535
* @summary Basic tests for methods in java.util.Objects
* @author Joseph D. Darcy
*/
import
java.util.*
;
public
class
BasicObjectsTest
{
public
static
void
main
(
String
...
args
)
{
int
errors
=
0
;
errors
+=
testEquals
();
errors
+=
testHashCode
();
errors
+=
testToString
();
errors
+=
testCompare
();
if
(
errors
>
0
)
throw
new
RuntimeException
();
}
private
static
int
testEquals
()
{
int
errors
=
0
;
Object
[]
values
=
{
null
,
"42"
,
42
};
for
(
int
i
=
0
;
i
<
values
.
length
;
i
++)
for
(
int
j
=
0
;
j
<
values
.
length
;
j
++)
{
boolean
expected
=
(
i
==
j
);
Object
a
=
values
[
i
];
Object
b
=
values
[
j
];
boolean
result
=
Objects
.
equals
(
a
,
b
);
if
(
result
!=
expected
)
{
errors
++;
System
.
err
.
printf
(
"When equating %s to %s, got %b instead of %b%n."
,
a
,
b
,
result
,
expected
);
}
}
return
errors
;
}
private
static
int
testHashCode
()
{
int
errors
=
0
;
errors
+=
(
Objects
.
hashCode
(
null
)
==
0
)
?
0
:
1
;
String
s
=
"42"
;
errors
+=
(
Objects
.
hashCode
(
s
)
==
s
.
hashCode
()
)
?
0
:
1
;
return
errors
;
}
private
static
int
testToString
()
{
int
errors
=
0
;
errors
+=
(
"null"
.
equals
(
Objects
.
toString
(
null
))
)
?
0
:
1
;
String
s
=
"Some string"
;
errors
+=
(
s
.
equals
(
Objects
.
toString
(
s
))
)
?
0
:
1
;
return
errors
;
}
private
static
int
testCompare
()
{
int
errors
=
0
;
String
[]
values
=
{
"e. e. cummings"
,
"zzz"
};
String
[]
VALUES
=
{
"E. E. Cummings"
,
"ZZZ"
};
errors
+=
compareTest
(
null
,
null
,
0
);
for
(
int
i
=
0
;
i
<
values
.
length
;
i
++)
{
String
a
=
values
[
i
];
errors
+=
compareTest
(
a
,
a
,
0
);
for
(
int
j
=
0
;
j
<
VALUES
.
length
;
j
++)
{
int
expected
=
Integer
.
compare
(
i
,
j
);
String
b
=
VALUES
[
j
];
errors
+=
compareTest
(
a
,
b
,
expected
);
}
}
return
errors
;
}
private
static
int
compareTest
(
String
a
,
String
b
,
int
expected
)
{
int
errors
=
0
;
int
result
=
Objects
.
compare
(
a
,
b
,
String
.
CASE_INSENSITIVE_ORDER
);
if
(
Integer
.
signum
(
result
)
!=
Integer
.
signum
(
expected
))
{
errors
++;
System
.
err
.
printf
(
"When comparing %s to %s, got %d instead of %d%n."
,
a
,
b
,
result
,
expected
);
}
return
errors
;
}
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录