Author: bvahdat
Date: Fri Dec 14 14:02:21 2012
New Revision: 1421866
URL: http://svn.apache.org/viewvc?rev=1421866&view=rev
Log:
Merged revisions 1421864 via svnmerge from
https://svn.apache.org/repos/asf/camel/trunk
........
r1421864 | bvahdat | 2012-12-14 14:59:57 +0100 (Fr, 14 Dez 2012) | 1 line
CAMEL-5861: Polished.
........
Modified:
camel/branches/camel-2.10.x/ (props changed)
camel/branches/camel-2.10.x/components/camel-quickfix/src/test/java/org/apache/camel/component/quickfixj/examples/RequestReplyExample.java
Propchange: camel/branches/camel-2.10.x/
------------------------------------------------------------------------------
Merged /camel/trunk:r1421864
Propchange: camel/branches/camel-2.10.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified:
camel/branches/camel-2.10.x/components/camel-quickfix/src/test/java/org/apache/camel/component/quickfixj/examples/RequestReplyExample.java
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/components/camel-quickfix/src/test/java/org/apache/camel/component/quickfixj/examples/RequestReplyExample.java?rev=1421866&r1=1421865&r2=1421866&view=diff
==============================================================================
---
camel/branches/camel-2.10.x/components/camel-quickfix/src/test/java/org/apache/camel/component/quickfixj/examples/RequestReplyExample.java
(original)
+++
camel/branches/camel-2.10.x/components/camel-quickfix/src/test/java/org/apache/camel/component/quickfixj/examples/RequestReplyExample.java
Fri Dec 14 14:02:21 2012
@@ -24,7 +24,7 @@ import java.util.UUID;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
-import org.apache.camel.Body;
+import org.apache.camel.CamelContext;
import org.apache.camel.Exchange;
import org.apache.camel.Header;
import org.apache.camel.builder.RouteBuilder;
@@ -66,7 +66,7 @@ public class RequestReplyExample {
}
public void run() throws Exception {
- DefaultCamelContext context = new DefaultCamelContext();
+ final CamelContext context = new DefaultCamelContext();
final CountDownLatch logonLatch = new CountDownLatch(1);
final String orderStatusServiceUrl =
"http://localhost:9123/order/status";
@@ -170,7 +170,7 @@ public class RequestReplyExample {
}
public static class FixSessionRouter {
- public String route(@Header("sessionID") String sessionID, @Body
Object body) {
+ public String route(@Header("sessionID") String sessionID) {
return
String.format("quickfix:examples/inprocess.cfg?sessionID=%s", sessionID);
}
}