This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push:
new 524e306 CAMEL-12451: Fixed CS
524e306 is described below
commit 524e30685e34c48b3d6254f3c21875aa296f96b0
Author: Claus Ibsen <claus.ib...@gmail.com>
AuthorDate: Fri Apr 20 08:35:10 2018 +0200
CAMEL-12451: Fixed CS
---
.../org/apache/camel/component/cxf/CxfConsumer.java | 7 ++-----
.../cxf/interceptors/UnitOfWorkCloserInterceptor.java | 19 ++++++++++++++++++-
.../org/apache/camel/component/cxf/util/CxfUtils.java | 8 +++-----
3 files changed, 23 insertions(+), 11 deletions(-)
diff --git
a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfConsumer.java
b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfConsumer.java
index 7181933..3ba12bf 100644
---
a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfConsumer.java
+++
b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfConsumer.java
@@ -19,11 +19,8 @@ package org.apache.camel.component.cxf;
import java.lang.reflect.Method;
import java.util.HashMap;
import java.util.Map;
-
import javax.xml.ws.WebFault;
-import org.apache.camel.component.cxf.interceptors.UnitOfWorkCloserInterceptor;
-import org.apache.camel.component.cxf.util.CxfUtils;
import org.w3c.dom.Element;
import org.apache.camel.AsyncCallback;
@@ -31,9 +28,10 @@ import org.apache.camel.ExchangePattern;
import org.apache.camel.ExchangeTimedOutException;
import org.apache.camel.Processor;
import org.apache.camel.component.cxf.common.message.CxfConstants;
+import org.apache.camel.component.cxf.interceptors.UnitOfWorkCloserInterceptor;
+import org.apache.camel.component.cxf.util.CxfUtils;
import org.apache.camel.impl.DefaultConsumer;
import org.apache.camel.util.ObjectHelper;
-
import org.apache.cxf.continuations.Continuation;
import org.apache.cxf.continuations.ContinuationProvider;
import org.apache.cxf.endpoint.Server;
@@ -51,7 +49,6 @@ import org.apache.cxf.ws.addressing.EndpointReferenceType;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-
/**
* A Consumer of exchanges for a service in CXF. CxfConsumer acts a CXF
* service to receive requests, convert them, and forward them to Camel
diff --git
a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/interceptors/UnitOfWorkCloserInterceptor.java
b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/interceptors/UnitOfWorkCloserInterceptor.java
index 8825403..c414c66 100644
---
a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/interceptors/UnitOfWorkCloserInterceptor.java
+++
b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/interceptors/UnitOfWorkCloserInterceptor.java
@@ -1,3 +1,19 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
package org.apache.camel.component.cxf.interceptors;
import org.apache.camel.component.cxf.util.CxfUtils;
@@ -21,6 +37,7 @@ public class UnitOfWorkCloserInterceptor extends
AbstractPhaseInterceptor<Messag
}
this.handleOneWayMessage = handleOneWayMessage;
}
+
public UnitOfWorkCloserInterceptor() {
super(Phase.POST_LOGICAL_ENDING);
}
@@ -40,7 +57,7 @@ public class UnitOfWorkCloserInterceptor extends
AbstractPhaseInterceptor<Messag
Exchange ex = message.getExchange();
BindingOperationInfo binding = ex.getBindingOperationInfo();
if (null != binding && null != binding.getOperationInfo() &&
binding.getOperationInfo().isOneWay()) {
- return true;
+ return true;
}
return false;
}
diff --git
a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/util/CxfUtils.java
b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/util/CxfUtils.java
index 70c794e..582682f 100644
---
a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/util/CxfUtils.java
+++
b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/util/CxfUtils.java
@@ -20,26 +20,24 @@ import java.io.InputStream;
import java.util.HashMap;
import java.util.Map;
import java.util.Map.Entry;
-
import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamWriter;
-import org.apache.camel.util.UnitOfWorkHelper;
-import org.apache.cxf.message.Exchange;
-import org.apache.cxf.message.Message;
import org.w3c.dom.Element;
import org.w3c.dom.NamedNodeMap;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
import org.apache.camel.converter.jaxp.XmlConverter;
+import org.apache.camel.util.UnitOfWorkHelper;
import org.apache.cxf.common.util.StringUtils;
import org.apache.cxf.helpers.IOUtils;
import org.apache.cxf.io.CachedOutputStream;
+import org.apache.cxf.message.Exchange;
+import org.apache.cxf.message.Message;
import org.apache.cxf.staxutils.StaxUtils;
import org.apache.cxf.staxutils.W3CDOMStreamWriter;
-
public final class CxfUtils {
private CxfUtils() {
--
To stop receiving notification emails like this one, please contact
davscl...@apache.org.
