Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
普通程序员一名
spring-framework
提交
f72c431e
S
spring-framework
项目概览
普通程序员一名
/
spring-framework
与 Fork 源项目一致
从无法访问的项目Fork
通知
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,发现更多精彩内容 >>
提交
f72c431e
编写于
6月 07, 2010
作者:
A
Arjen Poutsma
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
SPR-7257 - AbstractMarshaller incorrectly expects DOMResult to already have a node
上级
0dc29cb2
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
43 addition
and
4 deletion
+43
-4
org.springframework.oxm/src/main/java/org/springframework/oxm/support/AbstractMarshaller.java
...a/org/springframework/oxm/support/AbstractMarshaller.java
+16
-2
org.springframework.oxm/src/test/java/org/springframework/oxm/AbstractMarshallerTests.java
...java/org/springframework/oxm/AbstractMarshallerTests.java
+27
-2
未找到文件。
org.springframework.oxm/src/main/java/org/springframework/oxm/support/AbstractMarshaller.java
浏览文件 @
f72c431e
/*
* 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");
* you may not use this file except in compliance with the License.
...
...
@@ -189,7 +189,21 @@ public abstract class AbstractMarshaller implements Marshaller, Unmarshaller {
* @see #marshalDomNode(Object, org.w3c.dom.Node)
*/
protected
void
marshalDomResult
(
Object
graph
,
DOMResult
domResult
)
throws
XmlMappingException
{
Assert
.
notNull
(
domResult
.
getNode
(),
"DOMResult does not contain Node"
);
if
(
domResult
.
getNode
()
==
null
)
{
try
{
synchronized
(
this
.
documentBuilderFactoryMonitor
)
{
if
(
this
.
documentBuilderFactory
==
null
)
{
this
.
documentBuilderFactory
=
createDocumentBuilderFactory
();
}
}
DocumentBuilder
documentBuilder
=
createDocumentBuilder
(
this
.
documentBuilderFactory
);
domResult
.
setNode
(
documentBuilder
.
newDocument
());
}
catch
(
ParserConfigurationException
ex
)
{
throw
new
UnmarshallingFailureException
(
"Could not create document placeholder for DOMResult: "
+
ex
.
getMessage
(),
ex
);
}
}
marshalDomNode
(
graph
,
domResult
.
getNode
());
}
...
...
org.springframework.oxm/src/test/java/org/springframework/oxm/AbstractMarshallerTests.java
浏览文件 @
f72c431e
/*
* 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");
* you may not use this file except in compliance with the License.
...
...
@@ -28,8 +28,9 @@ import javax.xml.transform.dom.DOMResult;
import
javax.xml.transform.stax.StAXResult
;
import
javax.xml.transform.stream.StreamResult
;
import
static
org
.
custommonkey
.
xmlunit
.
XMLAssert
.
assertXMLEqual
;
import
static
org
.
custommonkey
.
xmlunit
.
XMLAssert
.
*
;
import
org.custommonkey.xmlunit.XMLUnit
;
import
static
org
.
junit
.
Assert
.
assertTrue
;
import
org.junit.Before
;
import
org.junit.Test
;
import
org.w3c.dom.Attr
;
...
...
@@ -86,6 +87,30 @@ public abstract class AbstractMarshallerTests {
assertXMLEqual
(
"Marshaller writes invalid DOMResult"
,
expected
,
result
);
}
@Test
public
void
marshalEmptyDOMResult
()
throws
Exception
{
DocumentBuilderFactory
documentBuilderFactory
=
DocumentBuilderFactory
.
newInstance
();
documentBuilderFactory
.
setNamespaceAware
(
true
);
DocumentBuilder
builder
=
documentBuilderFactory
.
newDocumentBuilder
();
DOMResult
domResult
=
new
DOMResult
();
marshaller
.
marshal
(
flights
,
domResult
);
assertTrue
(
"DOMResult does not contain a Document"
,
domResult
.
getNode
()
instanceof
Document
);
Document
result
=
(
Document
)
domResult
.
getNode
();
Document
expected
=
builder
.
newDocument
();
Element
flightsElement
=
expected
.
createElementNS
(
"http://samples.springframework.org/flight"
,
"tns:flights"
);
Attr
namespace
=
expected
.
createAttributeNS
(
"http://www.w3.org/2000/xmlns/"
,
"xmlns:tns"
);
namespace
.
setNodeValue
(
"http://samples.springframework.org/flight"
);
flightsElement
.
setAttributeNode
(
namespace
);
expected
.
appendChild
(
flightsElement
);
Element
flightElement
=
expected
.
createElementNS
(
"http://samples.springframework.org/flight"
,
"tns:flight"
);
flightsElement
.
appendChild
(
flightElement
);
Element
numberElement
=
expected
.
createElementNS
(
"http://samples.springframework.org/flight"
,
"tns:number"
);
flightElement
.
appendChild
(
numberElement
);
Text
text
=
expected
.
createTextNode
(
"42"
);
numberElement
.
appendChild
(
text
);
assertXMLEqual
(
"Marshaller writes invalid DOMResult"
,
expected
,
result
);
}
@Test
public
void
marshalStreamResultWriter
()
throws
Exception
{
StringWriter
writer
=
new
StringWriter
();
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录