svn commit: r809515 - /camel/trunk/camel-core/src/main/java/org/apache/camel/model/SortDefinition.java

[da...@apache.org]

Author: davsclaus
Date: Mon Aug 31 09:25:09 2009
New Revision: 809515

URL: http://svn.apache.org/viewvc?rev=809515&view=rev
Log:
Fixed sort to expose expression using a model object as the others do.

Modified:
    camel/trunk/camel-core/src/main/java/org/apache/camel/model/SortDefinition.java

Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/SortDefinition.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/SortDefinition.java?rev=809515&r1=809514&r2=809515&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/SortDefinition.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/SortDefinition.java Mon Aug 31 09:25:09 2009
@@ -89,7 +89,8 @@
             setExpression(bodyExpression());
         }
 
-        return new SortProcessor(getExpression(), getComparator());
+        Expression exp = expression.getExpression();
+        return new SortProcessor(exp, getComparator());
     }
 
     @Override
@@ -114,20 +115,18 @@
         this.comparatorRef = comparatorRef;
     }
 
-    public Expression getExpression() {
-        if (expression == null) {
-            return null;
-        }
-        if (expression.getExpression() != null) {
-            return expression.getExpression();
-        }
-        return expression.getExpressionType();
+    public ExpressionSubElementDefinition getExpression() {
+        return expression;
     }
 
     public void setExpression(Expression expression) {
         this.expression = new ExpressionSubElementDefinition(expression);
     }
 
+    public void setExpression(ExpressionSubElementDefinition expression) {
+        this.expression = expression;
+    }
+
     /**
      * Sets the comparator to use for sorting
      *