Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

fixed a couple of merge issues

  • Loading branch information...
commit 429c3d41015bf22665eedcc400625d7fb109f961 1 parent 8c4262e
@jstrachan jstrachan authored
View
4 eca/eca-core/src/main/java/org/fusesource/eca/component/eca/EcaComponent.java
@@ -37,10 +37,6 @@ protected Endpoint createEndpoint(String uri, String remaining, Map<String, Obje
+ maxConcurrentConsumers + " was " + consumers);
}
-<<<<<<< HEAD
- Integer size = getAndRemoveParameter(parameters, "size", Integer.class);
-=======
->>>>>>> 7.1.x.fuse-stable
EcaEndpoint answer = new EcaEndpoint(uri, this, getOrCreateQueue(uri, size), consumers);
answer.setCepRouteId(remaining);
answer.configureProperties(parameters);
View
4 eca/eca-core/src/main/java/org/fusesource/eca/component/statistics/StatisticsComponent.java
@@ -47,10 +47,6 @@ protected Endpoint createEndpoint(String uri, String remaining, Map<String, Obje
+ maxConcurrentConsumers + " was " + consumers);
}
-<<<<<<< HEAD
- Integer size = getAndRemoveParameter(parameters, "size", Integer.class);
-=======
->>>>>>> 7.1.x.fuse-stable
StatisticsEndpoint answer = new StatisticsEndpoint(uri, this, getOrCreateQueue(uri, size), consumers);
answer.configureProperties(parameters);
return answer;
Please sign in to comment.
Something went wrong with that request. Please try again.