You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2017/03/23 17:14:51 UTC
[1/2] cxf git commit: [CXF-5800] SchemaValidation of RPC/Lit
endpoints fails if data has attributes
Repository: cxf
Updated Branches:
refs/heads/3.1.x-fixes 8e90865f6 -> 12c921680
[CXF-5800] SchemaValidation of RPC/Lit endpoints fails if data has attributes
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/08277827
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/08277827
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/08277827
Branch: refs/heads/3.1.x-fixes
Commit: 0827782702165eed29e276ee12446b21e3ad0aae
Parents: 8e90865
Author: Daniel Kulp <dk...@apache.org>
Authored: Thu Mar 23 12:42:23 2017 -0400
Committer: Daniel Kulp <dk...@apache.org>
Committed: Thu Mar 23 13:14:46 2017 -0400
----------------------------------------------------------------------
.../org/apache/cxf/jaxb/JAXBEncoderDecoder.java | 16 +++++++++-------
1 file changed, 9 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/08277827/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBEncoderDecoder.java
----------------------------------------------------------------------
diff --git a/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBEncoderDecoder.java b/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBEncoderDecoder.java
index f66baee..06252cb 100644
--- a/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBEncoderDecoder.java
+++ b/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBEncoderDecoder.java
@@ -102,6 +102,7 @@ import org.apache.ws.commons.schema.constants.Constants;
public final class JAXBEncoderDecoder {
private static final class AddXSITypeStreamReader extends StreamReaderDelegate {
private boolean first = true;
+ private int offset = 1;
private final QName typeQName;
private AddXSITypeStreamReader(XMLStreamReader reader, QName typeQName) {
@@ -110,42 +111,42 @@ public final class JAXBEncoderDecoder {
}
public int getAttributeCount() {
- return super.getAttributeCount() + (first ? 1 : 0);
+ return super.getAttributeCount() + offset;
}
public String getAttributeLocalName(int index) {
if (first && index == 0) {
return "type";
}
- return super.getAttributeLocalName(index - 1);
+ return super.getAttributeLocalName(index - offset);
}
public QName getAttributeName(int index) {
if (first && index == 0) {
return new QName(Constants.URI_2001_SCHEMA_XSI, "type");
}
- return super.getAttributeName(index - 1);
+ return super.getAttributeName(index - offset);
}
public String getAttributeNamespace(int index) {
if (first && index == 0) {
return Constants.URI_2001_SCHEMA_XSI;
}
- return super.getAttributeNamespace(index - 1);
+ return super.getAttributeNamespace(index - offset);
}
public String getAttributePrefix(int index) {
if (first && index == 0) {
return "xsi";
}
- return super.getAttributePrefix(index - 1);
+ return super.getAttributePrefix(index - offset);
}
public String getAttributeType(int index) {
if (first && index == 0) {
return "#TEXT";
}
- return super.getAttributeType(index - 1);
+ return super.getAttributeType(index - offset);
}
public String getAttributeValue(int index) {
@@ -156,11 +157,12 @@ public final class JAXBEncoderDecoder {
}
return pfx + ":" + typeQName.getLocalPart();
}
- return super.getAttributeValue(index);
+ return super.getAttributeValue(index - offset);
}
public int next() throws XMLStreamException {
first = false;
+ offset = 0;
return super.next();
}
[2/2] cxf git commit: Recording .gitmergeinfo Changes
Posted by dk...@apache.org.
Recording .gitmergeinfo Changes
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/12c92168
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/12c92168
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/12c92168
Branch: refs/heads/3.1.x-fixes
Commit: 12c92168081373e6c0149ce77072da4a14e1b587
Parents: 0827782
Author: Daniel Kulp <dk...@apache.org>
Authored: Thu Mar 23 13:14:47 2017 -0400
Committer: Daniel Kulp <dk...@apache.org>
Committed: Thu Mar 23 13:14:47 2017 -0400
----------------------------------------------------------------------
.gitmergeinfo | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/12c92168/.gitmergeinfo
----------------------------------------------------------------------
diff --git a/.gitmergeinfo b/.gitmergeinfo
index fab8ca9..d65475a 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -390,6 +390,7 @@ M 6613e46662317ea151f72e26e5deb4f50148a148
M 66e97c77eaa43ab3a2cd95f0edc6a27e7445e8ce
M 6becb31c62ef0845a5078f4ec2124fe7bc264e58
M 6d7985f39b83d28b0ca3e485be8de8f986d6f6c1
+M 726c0aa641e408a18fa5f4ff82df682d489874f4
M 7304dfbd8f3044d8d46981abf2058c6cb732d219
M 746914a5084f5db8d0c0f052802c7ef2217b9b6b
M 74b8db2dcc5fc60a513d9e73e258aeba99727a39