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:13:38 UTC
[1/3] 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/master 28a092319 -> 6fd76780c
[CXF-7025] Fix problem detecting boundary with streams that return a single byte at a time
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/ea97f3dd
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/ea97f3dd
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/ea97f3dd
Branch: refs/heads/master
Commit: ea97f3dd62a3a271faf7f363aca618d921c14abb
Parents: 28a0923
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 15:40:41 2017 -0400
----------------------------------------------------------------------
.../apache/cxf/attachment/AttachmentDeserializer.java | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/ea97f3dd/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 3a82dc5..9b40a8a 100644
--- a/core/src/main/java/org/apache/cxf/attachment/AttachmentDeserializer.java
+++ b/core/src/main/java/org/apache/cxf/attachment/AttachmentDeserializer.java
@@ -157,8 +157,15 @@ 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);
[2/3] 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/408fe338
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/408fe338
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/408fe338
Branch: refs/heads/master
Commit: 408fe3384925122c4e68b7d020de5ff9d1376096
Parents: ea97f3d
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 16:22:55 2017 -0400
----------------------------------------------------------------------
distribution/src/main/release/samples/jaxws_spring_boot/pom.xml | 4 ----
.../src/main/release/samples/js_browser_client_simple/pom.xml | 4 ----
2 files changed, 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/408fe338/distribution/src/main/release/samples/jaxws_spring_boot/pom.xml
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jaxws_spring_boot/pom.xml b/distribution/src/main/release/samples/jaxws_spring_boot/pom.xml
index 88feb93..000f336 100644
--- a/distribution/src/main/release/samples/jaxws_spring_boot/pom.xml
+++ b/distribution/src/main/release/samples/jaxws_spring_boot/pom.xml
@@ -25,10 +25,6 @@
</dependencyManagement>
<dependencies>
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-jdk14</artifactId>
- </dependency>
- <dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-spring-boot-starter-jaxws</artifactId>
<version>${project.version}</version>
http://git-wip-us.apache.org/repos/asf/cxf/blob/408fe338/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 e2c24f1..b6f091b 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.2.0-SNAPSHOT</version>
</dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-context</artifactId>
- </dependency>
</dependencies>
</project>
[3/3] 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/6fd76780
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/6fd76780
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/6fd76780
Branch: refs/heads/master
Commit: 6fd76780cc60f477ca0ccbad2b2298051657ef2c
Parents: 408fe33
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 16:40:34 2017 -0400
----------------------------------------------------------------------
.../jaxws/validator/WrapperStyleNameCollisionValidator.java | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/6fd76780/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 40e4fe0..b23b48c 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 {