Author: ay
Date: Mon Jan 14 19:01:08 2013
New Revision: 1433043
URL: http://svn.apache.org/viewvc?rev=1433043&view=rev
Log:
Merged revisions 1433033 via svn merge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1433033 | ay | 2013-01-14 19:50:13 +0100 (Mon, 14 Jan 2013) | 1 line
[CXF-4753] stax outTransform cannot deep-drop an element hat has some
attributs
........
Modified:
cxf/branches/2.7.x-fixes/ (props changed)
cxf/branches/2.7.x-fixes/api/src/main/java/org/apache/cxf/staxutils/transform/OutTransformWriter.java
cxf/branches/2.7.x-fixes/api/src/test/java/org/apache/cxf/staxutils/resources/AddRequestIn3.xml
Propchange: cxf/branches/2.7.x-fixes/
('svn:mergeinfo' removed)
Propchange: cxf/branches/2.7.x-fixes/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Mon Jan 14 19:01:08 2013
@@ -1 +1 @@
-/cxf/trunk:1-1430398,1430564,1430881,1430882,1430905,1430965,1430976,1431315,1431604-1431607,1432070,1432236,1432798,1433007
+/cxf/trunk:1-1430398,1430564,1430881,1430882,1430905,1430965,1430976,1431315,1431604-1431607,1432070,1432236,1432798,1433007,1433033
Modified:
cxf/branches/2.7.x-fixes/api/src/main/java/org/apache/cxf/staxutils/transform/OutTransformWriter.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/api/src/main/java/org/apache/cxf/staxutils/transform/OutTransformWriter.java?rev=1433043&r1=1433042&r2=1433043&view=diff
==============================================================================
---
cxf/branches/2.7.x-fixes/api/src/main/java/org/apache/cxf/staxutils/transform/OutTransformWriter.java
(original)
+++
cxf/branches/2.7.x-fixes/api/src/main/java/org/apache/cxf/staxutils/transform/OutTransformWriter.java
Mon Jan 14 19:01:08 2013
@@ -409,6 +409,10 @@ public class OutTransformWriter extends
@Override
public void writeAttribute(String prefix, String uri, String local, String
value)
throws XMLStreamException {
+ if (matchesDropped(false)) {
+ return;
+ }
+
QName expected = attributesMap.get(new QName(uri, local, prefix));
if (expected != null) {
if (TransformUtils.isEmptyQName(expected)) {
@@ -426,6 +430,9 @@ public class OutTransformWriter extends
@Override
public void writeAttribute(String local, String value) throws
XMLStreamException {
+ if (matchesDropped(false)) {
+ return;
+ }
String uri = XMLConstants.NULL_NS_URI;
QName expected = attributesMap.get(new QName("", local));
if (expected != null) {
Modified:
cxf/branches/2.7.x-fixes/api/src/test/java/org/apache/cxf/staxutils/resources/AddRequestIn3.xml
URL:
http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/api/src/test/java/org/apache/cxf/staxutils/resources/AddRequestIn3.xml?rev=1433043&r1=1433042&r2=1433043&view=diff
==============================================================================
---
cxf/branches/2.7.x-fixes/api/src/test/java/org/apache/cxf/staxutils/resources/AddRequestIn3.xml
(original)
+++
cxf/branches/2.7.x-fixes/api/src/test/java/org/apache/cxf/staxutils/resources/AddRequestIn3.xml
Mon Jan 14 19:01:08 2013
@@ -21,6 +21,6 @@
<params>
<param><i1>1</i1></param>
<param><i2>2</i2></param>
- <param><i3>3</i3></param>
+ <param><i3 a3="v3">3</i3></param>
</params>
</payload>
