You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2016/04/28 14:46:20 UTC

[1/3] camel git commit: CAMEL-6720: Fixed potential NPE in camel-soap. Thanks to Movees for the fix.

Repository: camel
Updated Branches:
  refs/heads/camel-2.16.x 49baf4092 -> 6beac840c
  refs/heads/camel-2.17.x b8e628248 -> 76f4fe727
  refs/heads/master ef74ad512 -> 39509af13


CAMEL-6720: Fixed potential NPE in camel-soap. Thanks to Movees  for the fix.


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/39509af1
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/39509af1
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/39509af1

Branch: refs/heads/master
Commit: 39509af13790d3baaa6af383c35e509d01c92f6c
Parents: ef74ad5
Author: Claus Ibsen <da...@apache.org>
Authored: Thu Apr 28 14:45:36 2016 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Thu Apr 28 14:45:36 2016 +0200

----------------------------------------------------------------------
 .../camel/dataformat/soap/name/ServiceInterfaceStrategy.java      | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/39509af1/components/camel-soap/src/main/java/org/apache/camel/dataformat/soap/name/ServiceInterfaceStrategy.java
----------------------------------------------------------------------
diff --git a/components/camel-soap/src/main/java/org/apache/camel/dataformat/soap/name/ServiceInterfaceStrategy.java b/components/camel-soap/src/main/java/org/apache/camel/dataformat/soap/name/ServiceInterfaceStrategy.java
index a860d56..15884b8 100644
--- a/components/camel-soap/src/main/java/org/apache/camel/dataformat/soap/name/ServiceInterfaceStrategy.java
+++ b/components/camel-soap/src/main/java/org/apache/camel/dataformat/soap/name/ServiceInterfaceStrategy.java
@@ -96,7 +96,6 @@ public class ServiceInterfaceStrategy implements ElementNameStrategy {
         // parameter types are returned in declaration order
         Class<?>[] types = method.getParameterTypes();
         if (types.length == 0) {
-            typeInfos.add(new TypeInfo(null, null));
             return typeInfos;
         }
         if (requestWrapper != null && requestWrapper.className() != null) {
@@ -140,7 +139,7 @@ public class ServiceInterfaceStrategy implements ElementNameStrategy {
      * Determines how the parameter object of the service method will be named
      * in xml. It will use either the RequestWrapper annotation of the method if
      * present or the WebParam method of the parameter.
-     * 
+     *
      * @param method
      */
     private MethodInfo analyzeMethod(Method method) {


[2/3] camel git commit: CAMEL-6720: Fixed potential NPE in camel-soap. Thanks to Movees for the fix.

Posted by da...@apache.org.
CAMEL-6720: Fixed potential NPE in camel-soap. Thanks to Movees  for the fix.


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/76f4fe72
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/76f4fe72
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/76f4fe72

Branch: refs/heads/camel-2.17.x
Commit: 76f4fe727b5e9ab77c368da3c5a1667205039da7
Parents: b8e6282
Author: Claus Ibsen <da...@apache.org>
Authored: Thu Apr 28 14:45:36 2016 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Thu Apr 28 14:45:59 2016 +0200

----------------------------------------------------------------------
 .../camel/dataformat/soap/name/ServiceInterfaceStrategy.java      | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/76f4fe72/components/camel-soap/src/main/java/org/apache/camel/dataformat/soap/name/ServiceInterfaceStrategy.java
----------------------------------------------------------------------
diff --git a/components/camel-soap/src/main/java/org/apache/camel/dataformat/soap/name/ServiceInterfaceStrategy.java b/components/camel-soap/src/main/java/org/apache/camel/dataformat/soap/name/ServiceInterfaceStrategy.java
index a860d56..15884b8 100644
--- a/components/camel-soap/src/main/java/org/apache/camel/dataformat/soap/name/ServiceInterfaceStrategy.java
+++ b/components/camel-soap/src/main/java/org/apache/camel/dataformat/soap/name/ServiceInterfaceStrategy.java
@@ -96,7 +96,6 @@ public class ServiceInterfaceStrategy implements ElementNameStrategy {
         // parameter types are returned in declaration order
         Class<?>[] types = method.getParameterTypes();
         if (types.length == 0) {
-            typeInfos.add(new TypeInfo(null, null));
             return typeInfos;
         }
         if (requestWrapper != null && requestWrapper.className() != null) {
@@ -140,7 +139,7 @@ public class ServiceInterfaceStrategy implements ElementNameStrategy {
      * Determines how the parameter object of the service method will be named
      * in xml. It will use either the RequestWrapper annotation of the method if
      * present or the WebParam method of the parameter.
-     * 
+     *
      * @param method
      */
     private MethodInfo analyzeMethod(Method method) {


[3/3] camel git commit: CAMEL-6720: Fixed potential NPE in camel-soap. Thanks to Movees for the fix.

Posted by da...@apache.org.
CAMEL-6720: Fixed potential NPE in camel-soap. Thanks to Movees  for the fix.


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/6beac840
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/6beac840
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/6beac840

Branch: refs/heads/camel-2.16.x
Commit: 6beac840c427521c7bbfed71ce3711487aa51dd6
Parents: 49baf40
Author: Claus Ibsen <da...@apache.org>
Authored: Thu Apr 28 14:45:36 2016 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Thu Apr 28 14:46:12 2016 +0200

----------------------------------------------------------------------
 .../camel/dataformat/soap/name/ServiceInterfaceStrategy.java      | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/6beac840/components/camel-soap/src/main/java/org/apache/camel/dataformat/soap/name/ServiceInterfaceStrategy.java
----------------------------------------------------------------------
diff --git a/components/camel-soap/src/main/java/org/apache/camel/dataformat/soap/name/ServiceInterfaceStrategy.java b/components/camel-soap/src/main/java/org/apache/camel/dataformat/soap/name/ServiceInterfaceStrategy.java
index a860d56..15884b8 100644
--- a/components/camel-soap/src/main/java/org/apache/camel/dataformat/soap/name/ServiceInterfaceStrategy.java
+++ b/components/camel-soap/src/main/java/org/apache/camel/dataformat/soap/name/ServiceInterfaceStrategy.java
@@ -96,7 +96,6 @@ public class ServiceInterfaceStrategy implements ElementNameStrategy {
         // parameter types are returned in declaration order
         Class<?>[] types = method.getParameterTypes();
         if (types.length == 0) {
-            typeInfos.add(new TypeInfo(null, null));
             return typeInfos;
         }
         if (requestWrapper != null && requestWrapper.className() != null) {
@@ -140,7 +139,7 @@ public class ServiceInterfaceStrategy implements ElementNameStrategy {
      * Determines how the parameter object of the service method will be named
      * in xml. It will use either the RequestWrapper annotation of the method if
      * present or the WebParam method of the parameter.
-     * 
+     *
      * @param method
      */
     private MethodInfo analyzeMethod(Method method) {