From ed959d418fb064c2bf2742f7009840dadb1b2d27 Mon Sep 17 00:00:00 2001 From: Mark Fisher Date: Sat, 8 May 2010 20:24:29 +0000 Subject: [PATCH] removed timeout from Aggregator annotation --- .../integration/samples/cafe/annotation/Waiter.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/spring-integration-samples/cafe/src/main/java/org/springframework/integration/samples/cafe/annotation/Waiter.java b/spring-integration-samples/cafe/src/main/java/org/springframework/integration/samples/cafe/annotation/Waiter.java index 8602d676ef..d6c0b3f583 100644 --- a/spring-integration-samples/cafe/src/main/java/org/springframework/integration/samples/cafe/annotation/Waiter.java +++ b/spring-integration-samples/cafe/src/main/java/org/springframework/integration/samples/cafe/annotation/Waiter.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2010 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -30,7 +30,7 @@ import org.springframework.integration.samples.cafe.Drink; @MessageEndpoint public class Waiter { - @Aggregator(inputChannel = "preparedDrinks", outputChannel = "deliveries", timeout = 5 * 60 * 1000) + @Aggregator(inputChannel = "preparedDrinks", outputChannel = "deliveries") public Delivery prepareDelivery(List drinks) { return new Delivery(drinks); }