svn commit: r797494 - in /camel/trunk/examples/camel-example-loan-broker/src/main/java/org/apache/camel/loanbroker: queue/version/BankResponseAggregationStrategy.java queue/version/LoanBroker.java webservice/version/BankResponseAggregationStrategy.java

[ningjiang]

Author: ningjiang
Date: Fri Jul 24 14:38:17 2009
New Revision: 797494

URL: http://svn.apache.org/viewvc?rev=797494&view=rev
Log:
CAMEL-1852 fixed the camel-example-loan-broker issue

Modified:
    
camel/trunk/examples/camel-example-loan-broker/src/main/java/org/apache/camel/loanbroker/queue/version/BankResponseAggregationStrategy.java
    
camel/trunk/examples/camel-example-loan-broker/src/main/java/org/apache/camel/loanbroker/queue/version/LoanBroker.java
    
camel/trunk/examples/camel-example-loan-broker/src/main/java/org/apache/camel/loanbroker/webservice/version/BankResponseAggregationStrategy.java

Modified: 
camel/trunk/examples/camel-example-loan-broker/src/main/java/org/apache/camel/loanbroker/queue/version/BankResponseAggregationStrategy.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-loan-broker/src/main/java/org/apache/camel/loanbroker/queue/version/BankResponseAggregationStrategy.java?rev=797494&r1=797493&r2=797494&view=diff
==============================================================================
--- 
camel/trunk/examples/camel-example-loan-broker/src/main/java/org/apache/camel/loanbroker/queue/version/BankResponseAggregationStrategy.java
 (original)
+++ 
camel/trunk/examples/camel-example-loan-broker/src/main/java/org/apache/camel/loanbroker/queue/version/BankResponseAggregationStrategy.java
 Fri Jul 24 14:38:17 2009
@@ -43,13 +43,10 @@
 
         Message oldMessage;
         Message newMessage;
-        if (aggregatingOutMessage) {
-            oldMessage = oldExchange.getOut();
-            newMessage = newExchange.getOut();
-        } else {
-            oldMessage = oldExchange.getIn();
-            newMessage = newExchange.getIn();
-        }
+       
+        oldMessage = oldExchange.getIn();
+        newMessage = newExchange.getIn();
+
         Double oldRate = oldMessage.getHeader(Constants.PROPERTY_RATE, 
Double.class);
         Double newRate = newMessage.getHeader(Constants.PROPERTY_RATE, 
Double.class);
 

Modified: 
camel/trunk/examples/camel-example-loan-broker/src/main/java/org/apache/camel/loanbroker/queue/version/LoanBroker.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-loan-broker/src/main/java/org/apache/camel/loanbroker/queue/version/LoanBroker.java?rev=797494&r1=797493&r2=797494&view=diff
==============================================================================
--- 
camel/trunk/examples/camel-example-loan-broker/src/main/java/org/apache/camel/loanbroker/queue/version/LoanBroker.java
 (original)
+++ 
camel/trunk/examples/camel-example-loan-broker/src/main/java/org/apache/camel/loanbroker/queue/version/LoanBroker.java
 Fri Jul 24 14:38:17 2009
@@ -96,7 +96,7 @@
         // CreditAgency will get the request from parallelLoanRequestQueue
         from("jms:queue2:parallelLoanRequestQueue").process(new CreditAgency())
             // Set the aggregation strategy for aggregating the out message    
        
-            .multicast(new 
BankResponseAggregationStrategy().setAggregatingOutMessage(true))
+            .multicast(new BankResponseAggregationStrategy())
                 // Send out the request to three different banks in parallel
                 .parallelProcessing().to("jms:queue2:bank1", 
"jms:queue2:bank2", "jms:queue2:bank3");
         

Modified: 
camel/trunk/examples/camel-example-loan-broker/src/main/java/org/apache/camel/loanbroker/webservice/version/BankResponseAggregationStrategy.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-loan-broker/src/main/java/org/apache/camel/loanbroker/webservice/version/BankResponseAggregationStrategy.java?rev=797494&r1=797493&r2=797494&view=diff
==============================================================================
--- 
camel/trunk/examples/camel-example-loan-broker/src/main/java/org/apache/camel/loanbroker/webservice/version/BankResponseAggregationStrategy.java
 (original)
+++ 
camel/trunk/examples/camel-example-loan-broker/src/main/java/org/apache/camel/loanbroker/webservice/version/BankResponseAggregationStrategy.java
 Fri Jul 24 14:38:17 2009
@@ -35,10 +35,10 @@
         BankQuote oldQuote = oldExchange.getProperty(BANK_QUOTE, 
BankQuote.class);
         // Get the oldQute from out message body if we can't get it from the 
exchange
         if (oldQuote == null) {
-            oldQuote = oldExchange.getOut().getBody(BankQuote.class);
+            oldQuote = oldExchange.getIn().getBody(BankQuote.class);
         }
         // Get the newQuote
-        BankQuote newQuote = newExchange.getOut().getBody(BankQuote.class);
+        BankQuote newQuote = newExchange.getIn().getBody(BankQuote.class);
         Exchange result = null;
         BankQuote bankQuote;