From 3258b0826d114da4d6a34ba2c2ba05d606032fb0 Mon Sep 17 00:00:00 2001
From: David Turanski <dturanski_at_vmware_dot_com>
Date: Wed, 17 Apr 2013 07:57:08 -0400
Subject: [PATCH] SGF-169 added null check for inner gateways to
 GatewayHubFactoryBean

---
 .../gemfire/wan/GatewayHubFactoryBean.java    | 84 ++++++++++---------
 .../data/gemfire/config/gateway-v6-ns.xml     |  5 ++
 2 files changed, 51 insertions(+), 38 deletions(-)

diff --git a/src/main/java/org/springframework/data/gemfire/wan/GatewayHubFactoryBean.java b/src/main/java/org/springframework/data/gemfire/wan/GatewayHubFactoryBean.java
index cec34e95..1ab35dd8 100644
--- a/src/main/java/org/springframework/data/gemfire/wan/GatewayHubFactoryBean.java
+++ b/src/main/java/org/springframework/data/gemfire/wan/GatewayHubFactoryBean.java
@@ -84,7 +84,7 @@ public class GatewayHubFactoryBean extends AbstractWANComponentFactoryBean<Gatew
 		}
 
 		Assert.notNull(cache.getGatewayHub(name));
-		
+
 		if (bindAddress != null) {
 			gatewayHub.setBindAddress(bindAddress);
 		}
@@ -102,6 +102,49 @@ public class GatewayHubFactoryBean extends AbstractWANComponentFactoryBean<Gatew
 		if (maximumTimeBetweenPings != null) {
 			gatewayHub.setMaximumTimeBetweenPings(maximumTimeBetweenPings);
 		}
+		
+		if (!CollectionUtils.isEmpty(gateways)) {
+			configureGateways();
+		}
+		
+		if (gatewayHub.getManualStart() == false) {
+			try {
+				gatewayHub.start();
+			} catch (IOException e) {
+				throw new RuntimeException(e);
+			}
+		}
+	}
+
+	public void setPort(Integer port) {
+		this.port = port;
+	}
+
+	public void setBindAddress(String bindAddress) {
+		this.bindAddress = bindAddress;
+	}
+
+	public void setMaximumTimeBetweenPings(Integer maximumTimeBetweenPings) {
+		this.maximumTimeBetweenPings = maximumTimeBetweenPings;
+	}
+
+	public void setSocketBufferSize(Integer socketBufferSize) {
+		this.socketBufferSize = socketBufferSize;
+	}
+
+	public void setStartupPolicy(String startupPolicy) {
+		this.startupPolicy = startupPolicy;
+	}
+
+	public void setManualStart(Boolean manualStart) {
+		this.manualStart = manualStart;
+	}
+
+	public void setGateways(List<GatewayProxy> gateways) {
+		this.gateways = gateways;
+	}
+	
+	private void configureGateways() {
 		for (GatewayProxy gateway : gateways) {
 			Gateway gw = gatewayHub.addGateway(
 					gateway.getId(),
@@ -118,8 +161,8 @@ public class GatewayHubFactoryBean extends AbstractWANComponentFactoryBean<Gatew
 				}
 			}
 			if (gateway.getOrderPolicy() != null) {
-				Assert.isTrue(validOrderPolicyValues.contains(gateway.getOrderPolicy()), "The value of order policy:'"
-						+ gateway.getOrderPolicy() + "' is invalid");
+				Assert.isTrue(validOrderPolicyValues.contains(gateway.getOrderPolicy()),
+						"The value of order policy:'" + gateway.getOrderPolicy() + "' is invalid");
 				gw.setOrderPolicy(OrderPolicy.valueOf(gateway.getOrderPolicy()));
 			}
 			if (gateway.getSocketBufferSize() != null) {
@@ -157,40 +200,5 @@ public class GatewayHubFactoryBean extends AbstractWANComponentFactoryBean<Gatew
 				}
 			}
 		}
-		if (gatewayHub.getManualStart() == false) {
-			try {
-				gatewayHub.start();
-			} catch (IOException e) {
-				throw new RuntimeException(e);
-			}
-		}
-	}
-
-	public void setPort(Integer port) {
-		this.port = port;
-	}
-
-	public void setBindAddress(String bindAddress) {
-		this.bindAddress = bindAddress;
-	}
-
-	public void setMaximumTimeBetweenPings(Integer maximumTimeBetweenPings) {
-		this.maximumTimeBetweenPings = maximumTimeBetweenPings;
-	}
-
-	public void setSocketBufferSize(Integer socketBufferSize) {
-		this.socketBufferSize = socketBufferSize;
-	}
-
-	public void setStartupPolicy(String startupPolicy) {
-		this.startupPolicy = startupPolicy;
-	}
-
-	public void setManualStart(Boolean manualStart) {
-		this.manualStart = manualStart;
-	}
-
-	public void setGateways(List<GatewayProxy> gateways) {
-		this.gateways = gateways;
 	}
 }
diff --git a/src/test/resources/org/springframework/data/gemfire/config/gateway-v6-ns.xml b/src/test/resources/org/springframework/data/gemfire/config/gateway-v6-ns.xml
index 980f34f9..de3deaa9 100644
--- a/src/test/resources/org/springframework/data/gemfire/config/gateway-v6-ns.xml
+++ b/src/test/resources/org/springframework/data/gemfire/config/gateway-v6-ns.xml
@@ -23,4 +23,9 @@
             <gfe:gateway-endpoint port="2345" host="host2" endpoint-id="endpoint2"/>
         </gfe:gateway>
     </gfe:gateway-hub>
+ 
+ <!-- SGF-169 -->   
+    <gfe:gateway-hub id="uniDirectionalHub" manual-start="true" port="22222" startup-policy="none">
+	</gfe:gateway-hub>
+ 
 </beans>
\ No newline at end of file