Author: davsclaus
Date: Fri Dec 17 17:56:53 2010
New Revision: 1050459
URL: http://svn.apache.org/viewvc?rev=1050459&view=rev
Log:
Reverted commit revs 1050112 and 1050324 because it was really not good. The
model must be stateless as it can be used as skeleton for multiple real routes
being built
Removed:
camel/trunk/camel-core/src/test/java/org/apache/camel/impl/FromEndpointRouteDefinitionTest.java
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/model/FromDefinition.java
camel/trunk/camel-core/src/test/java/org/apache/camel/model/StartingRoutesErrorReportedTest.java
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/model/FromDefinition.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/FromDefinition.java?rev=1050459&r1=1050458&r2=1050459&view=diff
==============================================================================
---
camel/trunk/camel-core/src/main/java/org/apache/camel/model/FromDefinition.java
(original)
+++
camel/trunk/camel-core/src/main/java/org/apache/camel/model/FromDefinition.java
Fri Dec 17 17:56:53 2010
@@ -70,9 +70,11 @@ public class FromDefinition extends Opti
public Endpoint resolveEndpoint(RouteContext context) {
if (endpoint == null) {
- endpoint = context.resolveEndpoint(getUri(), getRef());
+ return context.resolveEndpoint(getUri(), getRef());
+ } else {
+ return endpoint;
}
- return endpoint;
+
}
// Properties
Modified:
camel/trunk/camel-core/src/test/java/org/apache/camel/model/StartingRoutesErrorReportedTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/model/StartingRoutesErrorReportedTest.java?rev=1050459&r1=1050458&r2=1050459&view=diff
==============================================================================
---
camel/trunk/camel-core/src/test/java/org/apache/camel/model/StartingRoutesErrorReportedTest.java
(original)
+++
camel/trunk/camel-core/src/test/java/org/apache/camel/model/StartingRoutesErrorReportedTest.java
Fri Dec 17 17:56:53 2010
@@ -36,7 +36,7 @@ public class StartingRoutesErrorReported
context.start();
fail();
} catch (FailedToCreateRouteException e) {
- assertTrue(e.getMessage().startsWith("Failed to create route
route1: Route[[From[direct:start?foo=bar]]"));
+ assertTrue(e.getMessage().startsWith("Failed to create route
route1: Route[[From[direct:start?foo=bar]] -> [To[mock:result]]] because of"));
}
}
@@ -51,7 +51,7 @@ public class StartingRoutesErrorReported
context.start();
fail();
} catch (FailedToCreateRouteException e) {
- assertTrue(e.getMessage(), e.getMessage().startsWith("Failed to
create route route2 at: >>> To[mock:result?foo=bar]"));
+ assertTrue(e.getMessage().startsWith("Failed to create route
route2 at: >>> To[mock:result?foo=bar] <<< in route: Route[[From[direct:start]]
-> [To[mock:result?foo=bar]]] because of"));
}
}
@@ -67,7 +67,7 @@ public class StartingRoutesErrorReported
});
context.start();
} catch (FailedToCreateRouteException e) {
- assertTrue(e.getMessage(), e.getMessage().startsWith("Failed to
create route route3 at: >>> Bean[ref:] <<< in route:
Route[[From[direct://start]] -> [To[mock:foo], Bean[ref:]]] because of"));
+ assertTrue(e.getMessage().startsWith("Failed to create route
route3 at: >>> Bean[ref:] <<< in route: Route[[From[direct:start]] ->
[To[mock:foo], Bean[ref:]]] because of"));
}
}