Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openanolis
dragonwell8_jdk
提交
5bcda916
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看板
提交
5bcda916
编写于
7月 06, 2009
作者:
M
malenkov
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
6723447: Introspector doesn't check return type for indexed property setters
Reviewed-by: rupashka
上级
fbe11642
变更
4
显示空白变更内容
内联
并排
Showing
4 changed file
with
103 addition
and
5 deletion
+103
-5
src/share/classes/java/beans/IndexedPropertyDescriptor.java
src/share/classes/java/beans/IndexedPropertyDescriptor.java
+6
-1
src/share/classes/java/beans/Introspector.java
src/share/classes/java/beans/Introspector.java
+3
-3
src/share/classes/java/beans/PropertyDescriptor.java
src/share/classes/java/beans/PropertyDescriptor.java
+6
-1
test/java/beans/Introspector/Test6723447.java
test/java/beans/Introspector/Test6723447.java
+88
-0
未找到文件。
src/share/classes/java/beans/IndexedPropertyDescriptor.java
浏览文件 @
5bcda916
/*
* Copyright 1996-200
8
Sun Microsystems, Inc. All Rights Reserved.
* Copyright 1996-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
...
...
@@ -274,6 +274,11 @@ perty.
}
indexedWriteMethod
=
Introspector
.
findMethod
(
cls
,
indexedWriteMethodName
,
2
,
(
type
==
null
)
?
null
:
new
Class
[]
{
int
.
class
,
type
});
if
(
indexedWriteMethod
!=
null
)
{
if
(!
indexedWriteMethod
.
getReturnType
().
equals
(
void
.
class
))
{
indexedWriteMethod
=
null
;
}
}
setIndexedWriteMethod0
(
indexedWriteMethod
);
}
return
indexedWriteMethod
;
...
...
src/share/classes/java/beans/Introspector.java
浏览文件 @
5bcda916
...
...
@@ -524,9 +524,9 @@ public class Introspector {
pd
=
new
PropertyDescriptor
(
this
.
beanClass
,
name
.
substring
(
2
),
method
,
null
);
}
}
else
if
(
argCount
==
1
)
{
if
(
argTypes
[
0
]
==
int
.
class
&&
name
.
startsWith
(
GET_PREFIX
))
{
if
(
int
.
class
.
equals
(
argTypes
[
0
])
&&
name
.
startsWith
(
GET_PREFIX
))
{
pd
=
new
IndexedPropertyDescriptor
(
this
.
beanClass
,
name
.
substring
(
3
),
null
,
null
,
method
,
null
);
}
else
if
(
resultType
==
void
.
class
&&
name
.
startsWith
(
SET_PREFIX
))
{
}
else
if
(
void
.
class
.
equals
(
resultType
)
&&
name
.
startsWith
(
SET_PREFIX
))
{
// Simple setter
pd
=
new
PropertyDescriptor
(
this
.
beanClass
,
name
.
substring
(
3
),
null
,
method
);
if
(
throwsException
(
method
,
PropertyVetoException
.
class
))
{
...
...
@@ -534,7 +534,7 @@ public class Introspector {
}
}
}
else
if
(
argCount
==
2
)
{
if
(
argTypes
[
0
]
==
int
.
class
&&
name
.
startsWith
(
SET_PREFIX
))
{
if
(
void
.
class
.
equals
(
resultType
)
&&
int
.
class
.
equals
(
argTypes
[
0
])
&&
name
.
startsWith
(
SET_PREFIX
))
{
pd
=
new
IndexedPropertyDescriptor
(
this
.
beanClass
,
name
.
substring
(
3
),
null
,
null
,
null
,
method
);
if
(
throwsException
(
method
,
PropertyVetoException
.
class
))
{
pd
.
setConstrained
(
true
);
...
...
src/share/classes/java/beans/PropertyDescriptor.java
浏览文件 @
5bcda916
/*
* Copyright 1996-200
8
Sun Microsystems, Inc. All Rights Reserved.
* Copyright 1996-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
...
...
@@ -294,6 +294,11 @@ public class PropertyDescriptor extends FeatureDescriptor {
writeMethod
=
Introspector
.
findMethod
(
cls
,
writeMethodName
,
1
,
(
type
==
null
)
?
null
:
new
Class
[]
{
type
});
if
(
writeMethod
!=
null
)
{
if
(!
writeMethod
.
getReturnType
().
equals
(
void
.
class
))
{
writeMethod
=
null
;
}
}
try
{
setWriteMethod
(
writeMethod
);
}
catch
(
IntrospectionException
ex
)
{
...
...
test/java/beans/Introspector/Test6723447.java
0 → 100644
浏览文件 @
5bcda916
/*
* 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 6723447
* @summary Tests return type for property setters
* @author Sergey Malenkov
*/
import
java.beans.IndexedPropertyDescriptor
;
import
java.beans.IntrospectionException
;
import
java.beans.Introspector
;
import
java.beans.PropertyDescriptor
;
import
java.lang.reflect.Method
;
import
java.math.BigDecimal
;
public
class
Test6723447
{
public
static
void
main
(
String
[]
args
)
{
test
(
Test6723447
.
class
);
test
(
BigDecimal
.
class
);
}
private
static
void
test
(
Class
<?>
type
)
{
for
(
PropertyDescriptor
pd
:
getPropertyDescriptors
(
type
))
{
test
(
pd
.
getWriteMethod
());
if
(
pd
instanceof
IndexedPropertyDescriptor
)
{
IndexedPropertyDescriptor
ipd
=
(
IndexedPropertyDescriptor
)
pd
;
test
(
ipd
.
getIndexedWriteMethod
());
}
}
}
private
static
void
test
(
Method
method
)
{
if
(
method
!=
null
)
{
Class
<?>
type
=
method
.
getReturnType
();
if
(!
type
.
equals
(
void
.
class
))
{
throw
new
Error
(
"unexpected return type: "
+
type
);
}
}
}
private
static
PropertyDescriptor
[]
getPropertyDescriptors
(
Class
<?>
type
)
{
try
{
return
Introspector
.
getBeanInfo
(
type
).
getPropertyDescriptors
();
}
catch
(
IntrospectionException
exception
)
{
throw
new
Error
(
"unexpected exception"
,
exception
);
}
}
public
Object
getValue
()
{
return
null
;
}
public
Object
setValue
(
Object
value
)
{
return
value
;
}
public
Object
getValues
(
int
index
)
{
return
null
;
}
public
Object
setValues
(
int
index
,
Object
value
)
{
return
value
;
}
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录