camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From davscl...@apache.org
Subject svn commit: r749201 - in /camel/trunk/camel-core/src/main/java/org/apache/camel: component/bean/MethodInfo.java impl/PollingConsumerSupport.java processor/RecipientList.java
Date Mon, 02 Mar 2009 05:57:40 GMT
Author: davsclaus
Date: Mon Mar  2 05:57:40 2009
New Revision: 749201

URL: http://svn.apache.org/viewvc?rev=749201&view=rev
Log:
CAMEL-588: Fixed bad tangle

Modified:
    camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/MethodInfo.java
    camel/trunk/camel-core/src/main/java/org/apache/camel/impl/PollingConsumerSupport.java
    camel/trunk/camel-core/src/main/java/org/apache/camel/processor/RecipientList.java

Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/MethodInfo.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/MethodInfo.java?rev=749201&r1=749200&r2=749201&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/MethodInfo.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/MethodInfo.java Mon
Mar  2 05:57:40 2009
@@ -30,14 +30,13 @@
 import org.apache.camel.Expression;
 import org.apache.camel.Pattern;
 import org.apache.camel.impl.ExpressionAdapter;
-import org.apache.camel.model.language.ConstantExpression;
 import org.apache.camel.processor.RecipientList;
-import org.apache.camel.util.ExchangeHelper;
 import org.apache.camel.util.ObjectHelper;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
 import static org.apache.camel.util.ObjectHelper.asString;
+
 /**
  * Information about a method to be used for invocation.
  *
@@ -67,7 +66,7 @@
             pattern = oneway.value();
         }
         if (method.getAnnotation(org.apache.camel.RecipientList.class) != null) {
-            recipientList = new RecipientList(new ConstantExpression(null));
+            recipientList = new RecipientList();
         }
     }
 
@@ -245,6 +244,7 @@
      * on an annotation which is also annotated
      *
      * @param annotatedElement the element to look for the annotation
+     * @param depth the current depth
      * @return the first matching annotation or null if none could be found
      */
     protected Pattern getPatternAnnotation(AnnotatedElement annotatedElement, int depth)
{

Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/impl/PollingConsumerSupport.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/PollingConsumerSupport.java?rev=749201&r1=749200&r2=749201&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/impl/PollingConsumerSupport.java
(original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/impl/PollingConsumerSupport.java
Mon Mar  2 05:57:40 2009
@@ -17,7 +17,6 @@
 package org.apache.camel.impl;
 
 import org.apache.camel.Endpoint;
-import org.apache.camel.Exchange;
 import org.apache.camel.PollingConsumer;
 import org.apache.camel.spi.ExceptionHandler;
 

Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/processor/RecipientList.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/RecipientList.java?rev=749201&r1=749200&r2=749201&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/processor/RecipientList.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/processor/RecipientList.java Mon
Mar  2 05:57:40 2009
@@ -41,9 +41,12 @@
  * @version $Revision$
  */
 public class RecipientList extends ServiceSupport implements Processor {
-    private final Expression expression;
+    private Expression expression;
     private ProducerCache producerCache = new ProducerCache();
 
+    public RecipientList() {
+    }
+
     public RecipientList(Expression expression) {
         notNull(expression, "expression");
         this.expression = expression;
@@ -51,7 +54,7 @@
 
     @Override
     public String toString() {
-        return "RecipientList[" + expression + "]";
+        return "RecipientList[" + (expression != null ? expression : "") + "]";
     }
 
     public void process(Exchange exchange) throws Exception {



Mime
View raw message