You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ni...@apache.org on 2013/08/16 09:40:24 UTC
[2/2] git commit: Fixed other CS errors
Fixed other CS errors
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/f3285bee
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/f3285bee
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/f3285bee
Branch: refs/heads/master
Commit: f3285bee421c6f7b5da402a976c9b3c2e3a214fd
Parents: cd5ed05
Author: Willem Jiang <ni...@apache.org>
Authored: Fri Aug 16 14:56:10 2013 +0800
Committer: Willem Jiang <ni...@apache.org>
Committed: Fri Aug 16 14:58:34 2013 +0800
----------------------------------------------------------------------
.../org/apache/camel/component/cxf/CxfConsumer.java | 16 ++++------------
1 file changed, 4 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/f3285bee/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfConsumer.java
----------------------------------------------------------------------
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 cc8145e..53bb9d6 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
@@ -62,7 +62,6 @@ public class CxfConsumer extends DefaultConsumer {
// create server
ServerFactoryBean svrBean = endpoint.createServerFactoryBean();
svrBean.setInvoker(new Invoker() {
-
// we receive a CXF request when this method is called
public Object invoke(Exchange cxfExchange, Object o) {
LOG.trace("Received CXF Request: {}", cxfExchange);
@@ -75,8 +74,7 @@ public class CxfConsumer extends DefaultConsumer {
LOG.trace("Calling the Camel sync processors.");
return syncInvoke(cxfExchange);
}
- }
-
+ }
// NOTE this code cannot work with CXF 2.2.x and JMSContinuation
// as it doesn't break out the interceptor chain when we call it
private Object asyncInvoke(Exchange cxfExchange, final Continuation continuation) {
@@ -115,7 +113,6 @@ public class CxfConsumer extends DefaultConsumer {
}
return null;
}
-
private Continuation getContinuation(Exchange cxfExchange) {
ContinuationProvider provider =
(ContinuationProvider)cxfExchange.getInMessage().get(ContinuationProvider.class.getName());
@@ -128,7 +125,6 @@ public class CxfConsumer extends DefaultConsumer {
return continuation;
}
}
-
private Object syncInvoke(Exchange cxfExchange) {
org.apache.camel.Exchange camelExchange = prepareCamelExchange(cxfExchange);
try {
@@ -145,7 +141,6 @@ public class CxfConsumer extends DefaultConsumer {
} finally {
doneUoW(camelExchange);
}
-
// response should have been set in outMessage's content
return null;
}
@@ -192,7 +187,6 @@ public class CxfConsumer extends DefaultConsumer {
if (endpoint.getMergeProtocolHeaders()) {
camelExchange.setProperty(CxfConstants.CAMEL_CXF_PROTOCOL_HEADERS_MERGED, Boolean.TRUE);
}
-
// bind the CXF request into a Camel exchange
binding.populateExchangeFromCxfRequest(cxfExchange, camelExchange);
// extract the javax.xml.ws header
@@ -201,7 +195,6 @@ public class CxfConsumer extends DefaultConsumer {
// put the context into camelExchange
camelExchange.setProperty(CxfConstants.JAXWS_CONTEXT, context);
return camelExchange;
-
}
@SuppressWarnings("unchecked")
@@ -230,12 +223,11 @@ public class CxfConsumer extends DefaultConsumer {
cxfExchange.getInMessage().put(FaultMode.class, FaultMode.CHECKED_APPLICATION_FAULT);
throw (Fault)t;
} else if (t != null) {
- // This is not a CXF Fault. Build the CXF Fault manuallly.
+ // This is not a CXF Fault. Build the CXF Fault manually.
Fault fault = new Fault(t);
if (fault.getMessage() == null) {
- // The Fault has no Message. This is the case if t had
- // no message, for
- // example was a NullPointerException.
+ // The Fault has no Message. This is the case if it has
+ // no message, for example was a NullPointerException.
fault.setMessage(t.getClass().getSimpleName());
}
WebFault faultAnnotation = t.getClass().getAnnotation(WebFault.class);