Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
爱吃血肠
spring-framework
提交
0a17e417
S
spring-framework
项目概览
爱吃血肠
/
spring-framework
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
S
spring-framework
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
0a17e417
编写于
9月 01, 2010
作者:
J
Juergen Hoeller
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
catch invalid arguments early; avoid stack overflow in object-to-collection case (SPR-7488)
上级
055c343c
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
12 addition
and
4 deletion
+12
-4
org.springframework.core/src/main/java/org/springframework/core/convert/support/GenericConversionService.java
...mework/core/convert/support/GenericConversionService.java
+2
-1
org.springframework.core/src/main/java/org/springframework/core/convert/support/ObjectToCollectionConverter.java
...ork/core/convert/support/ObjectToCollectionConverter.java
+10
-3
未找到文件。
org.springframework.core/src/main/java/org/springframework/core/convert/support/GenericConversionService.java
浏览文件 @
0a17e417
...
@@ -170,9 +170,10 @@ public class GenericConversionService implements ConversionService, ConverterReg
...
@@ -170,9 +170,10 @@ public class GenericConversionService implements ConversionService, ConverterReg
logger
.
debug
(
"Converted to null"
);
logger
.
debug
(
"Converted to null"
);
return
null
;
return
null
;
}
}
Assert
.
isTrue
(
source
==
null
||
sourceType
.
getObjectType
().
isInstance
(
source
));
GenericConverter
converter
=
getConverter
(
sourceType
,
targetType
);
GenericConverter
converter
=
getConverter
(
sourceType
,
targetType
);
if
(
converter
==
null
)
{
if
(
converter
==
null
)
{
if
(
source
==
null
||
targetType
.
getType
().
isInstance
(
source
))
{
if
(
source
==
null
||
targetType
.
get
Object
Type
().
isInstance
(
source
))
{
logger
.
debug
(
"No converter found - returning assignable source object as-is"
);
logger
.
debug
(
"No converter found - returning assignable source object as-is"
);
return
source
;
return
source
;
}
}
...
...
org.springframework.core/src/main/java/org/springframework/core/convert/support/ObjectToCollectionConverter.java
浏览文件 @
0a17e417
/*
/*
* Copyright 2002-20
09
the original author or authors.
* Copyright 2002-20
10
the original author or authors.
*
*
* Licensed under the Apache License, Version 2.0 (the "License");
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* you may not use this file except in compliance with the License.
...
@@ -30,6 +30,7 @@ import org.springframework.core.convert.converter.ConditionalGenericConverter;
...
@@ -30,6 +30,7 @@ import org.springframework.core.convert.converter.ConditionalGenericConverter;
* Will convert the Object to the target Collection's parameterized type if necessary.
* Will convert the Object to the target Collection's parameterized type if necessary.
*
*
* @author Keith Donald
* @author Keith Donald
* @author Juergen Hoeller
* @since 3.0
* @since 3.0
*/
*/
final
class
ObjectToCollectionConverter
implements
ConditionalGenericConverter
{
final
class
ObjectToCollectionConverter
implements
ConditionalGenericConverter
{
...
@@ -54,8 +55,14 @@ final class ObjectToCollectionConverter implements ConditionalGenericConverter {
...
@@ -54,8 +55,14 @@ final class ObjectToCollectionConverter implements ConditionalGenericConverter {
return
null
;
return
null
;
}
}
Collection
target
=
CollectionFactory
.
createCollection
(
targetType
.
getType
(),
1
);
Collection
target
=
CollectionFactory
.
createCollection
(
targetType
.
getType
(),
1
);
Object
targetElement
=
this
.
conversionService
.
convert
(
source
,
sourceType
,
targetType
.
getElementTypeDescriptor
(
source
));
TypeDescriptor
elementType
=
targetType
.
getElementTypeDescriptor
(
source
);
target
.
add
(
targetElement
);
// Avoid potential recursion...
if
(!
Collection
.
class
.
isAssignableFrom
(
elementType
.
getType
()))
{
target
.
add
(
this
.
conversionService
.
convert
(
source
,
sourceType
,
elementType
));
}
else
{
target
.
add
(
source
);
}
return
target
;
return
target
;
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录