diff --git a/spring-integration-core/src/main/java/org/springframework/integration/adapter/jms/JmsMessageDrivenSourceAdapter.java b/spring-integration-core/src/main/java/org/springframework/integration/adapter/jms/JmsMessageDrivenSourceAdapter.java
index d7fd93adc4..2eeeaf1337 100644
--- a/spring-integration-core/src/main/java/org/springframework/integration/adapter/jms/JmsMessageDrivenSourceAdapter.java
+++ b/spring-integration-core/src/main/java/org/springframework/integration/adapter/jms/JmsMessageDrivenSourceAdapter.java
@@ -116,6 +116,7 @@ public class JmsMessageDrivenSourceAdapter extends AbstractSourceAdapter<Object>
 		dmlc.setMaxConcurrentConsumers(this.maxConcurrentConsumers);
 		dmlc.setMaxMessagesPerTask(this.maxMessagesPerTask);
 		dmlc.setIdleTaskExecutionLimit(this.idleTaskExecutionLimit);
+		dmlc.setSessionTransacted(true);
 		dmlc.setAutoStartup(false);
 		ChannelPublishingJmsListener listener = new ChannelPublishingJmsListener(this.getChannel());
 		listener.setMessageConverter(this.messageConverter);
diff --git a/spring-integration-samples/src/main/java/org/springframework/integration/samples/cafe/CafeDemo.java b/spring-integration-samples/src/main/java/org/springframework/integration/samples/cafe/CafeDemo.java
index 5ea23c9e47..9064b6c208 100644
--- a/spring-integration-samples/src/main/java/org/springframework/integration/samples/cafe/CafeDemo.java
+++ b/spring-integration-samples/src/main/java/org/springframework/integration/samples/cafe/CafeDemo.java
@@ -38,7 +38,7 @@ public class CafeDemo {
 		Drink icedTripleMocha = new Drink(DrinkType.MOCHA, 3, true);
 		order.addDrink(hotDoubleLatte);
 		order.addDrink(icedTripleMocha);
-		for (int i = 0; i < 10; i++) {
+		for (int i = 0; i < 100; i++) {
 			cafe.placeOrder(order);
 		}
 	}
diff --git a/spring-integration-samples/src/main/java/org/springframework/integration/samples/cafe/DrinkRouter.java b/spring-integration-samples/src/main/java/org/springframework/integration/samples/cafe/DrinkRouter.java
index f917f9a5a3..9634d2e20e 100644
--- a/spring-integration-samples/src/main/java/org/springframework/integration/samples/cafe/DrinkRouter.java
+++ b/spring-integration-samples/src/main/java/org/springframework/integration/samples/cafe/DrinkRouter.java
@@ -27,12 +27,7 @@ public class DrinkRouter {
 
 	@Router
 	public String resolveDrinkChannel(Drink drink) {
-		if (drink.isIced()) {
-			return "coldDrinks";
-		}
-		else {
-			return "hotDrinks";
-		}
+		return (drink.isIced()) ? "coldDrinks" : "hotDrinks";
 	}
 
 }