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/30 22:14:43 UTC
[1/4] cxf git commit: [CXF-7025] Fix problem detecting boundary with
streams that return a single byte at a time
Repository: cxf
Updated Branches:
refs/heads/3.1.x-fixes 9ada62abb -> 551f30a4f
[CXF-7025] Fix problem detecting boundary with streams that return a single byte at a time
# Conflicts:
# core/src/main/java/org/apache/cxf/attachment/AttachmentDeserializer.java
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/a6126699
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/a6126699
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/a6126699
Branch: refs/heads/3.1.x-fixes
Commit: a61266990ad8b5659bd4cdea41bfd2565c15c2f8
Parents: 9ada62a
Author: Daniel Kulp <dk...@apache.org>
Authored: Thu Mar 30 15:40:41 2017 -0400
Committer: Daniel Kulp <dk...@apache.org>
Committed: Thu Mar 30 18:14:29 2017 -0400
----------------------------------------------------------------------
.../apache/cxf/attachment/AttachmentDeserializer.java | 13 ++++++++++---
1 file changed, 10 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/a6126699/core/src/main/java/org/apache/cxf/attachment/AttachmentDeserializer.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/attachment/AttachmentDeserializer.java b/core/src/main/java/org/apache/cxf/attachment/AttachmentDeserializer.java
index 05a5598..e526bb9 100644
--- a/core/src/main/java/org/apache/cxf/attachment/AttachmentDeserializer.java
+++ b/core/src/main/java/org/apache/cxf/attachment/AttachmentDeserializer.java
@@ -157,9 +157,16 @@ public class AttachmentDeserializer {
PushbackInputStream in = new PushbackInputStream(is, 4096);
byte buf[] = new byte[2048];
int i = in.read(buf);
- String msg = IOUtils.newStringFromBytes(buf, 0, i);
- in.unread(buf, 0, i);
-
+ int len = i;
+ while (i > 0 && len < buf.length) {
+ i = in.read(buf, len, buf.length - len);
+ if (i > 0) {
+ len += i;
+ }
+ }
+ String msg = IOUtils.newStringFromBytes(buf, 0, len);
+ in.unread(buf, 0, len);
+
// Reset the input stream since we'll need it again later
message.setContent(InputStream.class, in);
[4/4] 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/551f30a4
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/551f30a4
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/551f30a4
Branch: refs/heads/3.1.x-fixes
Commit: 551f30a4f26629c8ce7ab3f40a0764a06f4bce56
Parents: 6f77d2f
Author: Daniel Kulp <dk...@apache.org>
Authored: Thu Mar 30 18:14:35 2017 -0400
Committer: Daniel Kulp <dk...@apache.org>
Committed: Thu Mar 30 18:14:35 2017 -0400
----------------------------------------------------------------------
.gitmergeinfo | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/551f30a4/.gitmergeinfo
----------------------------------------------------------------------
diff --git a/.gitmergeinfo b/.gitmergeinfo
index af6315c..65bcc65 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -382,6 +382,7 @@ M 3b967cf6d9c67bebb6e0705a3fdede4d2a6b1015
M 3bbfc22e182ffea8c98ba8f84b4f55abfce353e7
M 3be9aac26a003ef43995054da875ffd5fa5a2eb4
M 3e30d8892a723adcf04268efd7d407e164607065
+M 408fe3384925122c4e68b7d020de5ff9d1376096
M 417fb946eec38f403d915e90f405594675a7f7e0
M 428f7700de80d4d6ea09158f42d057e9f24abe48
M 437c7daa3345c8482deab4a4da9b164e68fd417a
@@ -503,6 +504,7 @@ M e578ea946aa13177adef98727e3e4606652ffc76
M e6d42f6d6684feb46fc0bfbc0520ed13f0f002aa
M e70c78ead201362c1a2f0937c23d9c50e3ca9542
M e92e57c1f14de911cd2315a907443c79e91a94de
+M ea97f3dd62a3a271faf7f363aca618d921c14abb
M eb31ffe4f95c4dc6ac9a2ac56e15ae89b578359e
M ed9298066428c0dfc4590a556876d696a4ba13c0
M ee248ce7a4a1b04bcbddbdcef82d695ccc140160
[3/4] cxf git commit: [CXF-6894] prevent NPE if request uses
anonymous types
Posted by dk...@apache.org.
[CXF-6894] prevent NPE if request uses anonymous types
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/6f77d2f5
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/6f77d2f5
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/6f77d2f5
Branch: refs/heads/3.1.x-fixes
Commit: 6f77d2f5480a9c8b7f94f016467d12ea70d754c9
Parents: c22db8e
Author: Daniel Kulp <dk...@apache.org>
Authored: Thu Mar 30 16:40:34 2017 -0400
Committer: Daniel Kulp <dk...@apache.org>
Committed: Thu Mar 30 18:14:35 2017 -0400
----------------------------------------------------------------------
.../jaxws/validator/WrapperStyleNameCollisionValidator.java | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/6f77d2f5/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/validator/WrapperStyleNameCollisionValidator.java
----------------------------------------------------------------------
diff --git a/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/validator/WrapperStyleNameCollisionValidator.java b/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/validator/WrapperStyleNameCollisionValidator.java
index 5d3b700..dfe1a85 100644
--- a/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/validator/WrapperStyleNameCollisionValidator.java
+++ b/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/validator/WrapperStyleNameCollisionValidator.java
@@ -167,9 +167,11 @@ public class WrapperStyleNameCollisionValidator extends ServiceValidator {
String mappedName = mapElementName(operation,
operation.getUnwrappedOperation().getOutput(),
element);
+
+ QName mn = names.get(mappedName);
if (names.containsKey(mappedName)
- && !(names.get(mappedName) == element.getSchemaTypeName()
- || names.get(mappedName).equals(element.getSchemaTypeName()))) {
+ && !(mn == element.getSchemaTypeName()
+ || (mn != null && mn.equals(element.getSchemaTypeName())))) {
handleErrors(names.get(mappedName), element);
return false;
} else {
[2/4] cxf git commit: Fix samples compile failure with latest maven
Posted by dk...@apache.org.
Fix samples compile failure with latest maven
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/c22db8ef
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/c22db8ef
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/c22db8ef
Branch: refs/heads/3.1.x-fixes
Commit: c22db8ef5b7fcb5cf2402ac5bdc52a2edffcb5c3
Parents: a612669
Author: Daniel Kulp <dk...@apache.org>
Authored: Thu Mar 30 16:12:09 2017 -0400
Committer: Daniel Kulp <dk...@apache.org>
Committed: Thu Mar 30 18:14:32 2017 -0400
----------------------------------------------------------------------
.../src/main/release/samples/js_browser_client_simple/pom.xml | 4 ----
1 file changed, 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/c22db8ef/distribution/src/main/release/samples/js_browser_client_simple/pom.xml
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/js_browser_client_simple/pom.xml b/distribution/src/main/release/samples/js_browser_client_simple/pom.xml
index 4e12008..080ba90 100644
--- a/distribution/src/main/release/samples/js_browser_client_simple/pom.xml
+++ b/distribution/src/main/release/samples/js_browser_client_simple/pom.xml
@@ -128,9 +128,5 @@
<artifactId>cxf-rt-transports-http-jetty</artifactId>
<version>3.1.11-SNAPSHOT</version>
</dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-context</artifactId>
- </dependency>
</dependencies>
</project>