Repository: camel Updated Branches: refs/heads/camel-2.19.x 1e68bf73c -> cddb41191
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/25fbb790 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/25fbb790 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/25fbb790 Branch: refs/heads/camel-2.19.x Commit: 25fbb790ea4ea9f24bdad4aea35d1f22be0bdd30 Parents: 1e68bf7 Author: Daniel Kulp <dk...@apache.org> Authored: Mon Sep 11 16:18:15 2017 -0400 Committer: Claus Ibsen <davscl...@apache.org> Committed: Fri Sep 22 20:39:27 2017 +0200 ---------------------------------------------------------------------- .../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/25fbb790/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()); } }
