From e80913c639490f2d8a98cf3dd07cc15c9d86bc11 Mon Sep 17 00:00:00 2001
From: Mark Fisher <markfisher@vmware.com>
Date: Thu, 16 Dec 2010 17:52:11 -0500
Subject: [PATCH] XmppConnectionFactoryBean's autoStartup property is now true
 by default (not just via schema-based configuration + parsing)

---
 .../integration/xmpp/config/XmppConnectionFactoryBean.java      | 2 +-
 .../xmpp/config/XmppConnectionFactoryBeanTests-context.xml      | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/spring-integration-xmpp/src/main/java/org/springframework/integration/xmpp/config/XmppConnectionFactoryBean.java b/spring-integration-xmpp/src/main/java/org/springframework/integration/xmpp/config/XmppConnectionFactoryBean.java
index 540a04b84f..ef8ecd73c5 100644
--- a/spring-integration-xmpp/src/main/java/org/springframework/integration/xmpp/config/XmppConnectionFactoryBean.java
+++ b/spring-integration-xmpp/src/main/java/org/springframework/integration/xmpp/config/XmppConnectionFactoryBean.java
@@ -50,7 +50,7 @@ public class XmppConnectionFactoryBean extends AbstractFactoryBean<XMPPConnectio
 	
 	private volatile XMPPConnection connection;
 	
-	private volatile boolean autoStartup;
+	private volatile boolean autoStartup = true;
 
 	private volatile int phase = Integer.MIN_VALUE;
 
diff --git a/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/config/XmppConnectionFactoryBeanTests-context.xml b/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/config/XmppConnectionFactoryBeanTests-context.xml
index 964669c762..1eb95defa3 100644
--- a/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/config/XmppConnectionFactoryBeanTests-context.xml
+++ b/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/config/XmppConnectionFactoryBeanTests-context.xml
@@ -13,6 +13,7 @@
 				<constructor-arg value="myServiceName"/>
 			</bean>
 		</constructor-arg>
+		<property name="autoStartup" value="false"/>
 	</bean>
 	
 	<int:channel id="outboundEventChannel"/>