camel git commit: Fix that will be required when updating to CXF 3.2.0

classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

camel git commit: Fix that will be required when updating to CXF 3.2.0

dkulp@apache.org
Repository: camel
Updated Branches:
  refs/heads/master 858a7c6c1 -> e201f1235


Fix that will be required when updating to CXF 3.2.0


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

Branch: refs/heads/master
Commit: e201f1235f271762ac42da6e9de2307805858c95
Parents: 858a7c6
Author: Daniel Kulp <[hidden email]>
Authored: Mon Sep 11 16:18:15 2017 -0400
Committer: Daniel Kulp <[hidden email]>
Committed: Mon Sep 11 16:18:42 2017 -0400

----------------------------------------------------------------------
 .../java/org/apache/camel/component/cxf/jaxrs/CxfRsEndpoint.java  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/e201f123/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsEndpoint.java
----------------------------------------------------------------------
diff --git a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsEndpoint.java b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsEndpoint.java
index ecb16ae..015918a 100644
--- a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsEndpoint.java
+++ b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsEndpoint.java
@@ -46,6 +46,7 @@ import org.apache.camel.util.jsse.SSLContextParameters;
 import org.apache.cxf.Bus;
 import org.apache.cxf.BusFactory;
 import org.apache.cxf.common.util.ModCountCopyOnWriteArrayList;
+import org.apache.cxf.common.util.StringUtils;
 import org.apache.cxf.feature.Feature;
 import org.apache.cxf.feature.LoggingFeature;
 import org.apache.cxf.interceptor.AbstractBasicInterceptorProvider;
@@ -290,7 +291,7 @@ public class CxfRsEndpoint extends DefaultEndpoint implements HeaderFilterStrate
      */
     private void processUserResources(JAXRSServerFactoryBean sfb, List<UserResource> resources) {
         for (UserResource resource : resources) {
-            if (resource.getName() == null) {
+            if (StringUtils.isEmpty(resource.getName())) {
                 resource.setName(DefaultModelResource.class.getName());
             }
         }