From 0403b64ce8862d690fe417ede6c2871ef8597930 Mon Sep 17 00:00:00 2001
From: costin <cleau@vmware.com>
Date: Thu, 15 Jul 2010 20:32:49 +0300
Subject: [PATCH] + fix to minor bugs regarding naming

---
 .../java/org/springframework/data/gemfire/CacheFactoryBean.java | 2 +-
 .../org/springframework/data/gemfire/RegionFactoryBean.java     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/springframework/data/gemfire/CacheFactoryBean.java b/src/main/java/org/springframework/data/gemfire/CacheFactoryBean.java
index b24a8a13..b0b5244a 100644
--- a/src/main/java/org/springframework/data/gemfire/CacheFactoryBean.java
+++ b/src/main/java/org/springframework/data/gemfire/CacheFactoryBean.java
@@ -114,7 +114,7 @@ public class CacheFactoryBean implements BeanNameAware, BeanFactoryAware, BeanCl
 	}
 
 	private Properties mergeProperties() {
-		Properties cfgProps = new Properties(properties);
+		Properties cfgProps = (properties != null ? (Properties) properties.clone() : new Properties());
 		if (StringUtils.hasText(name)) {
 			cfgProps.setProperty("name", name.trim());
 		}
diff --git a/src/main/java/org/springframework/data/gemfire/RegionFactoryBean.java b/src/main/java/org/springframework/data/gemfire/RegionFactoryBean.java
index 5b348bc4..a0b57180 100644
--- a/src/main/java/org/springframework/data/gemfire/RegionFactoryBean.java
+++ b/src/main/java/org/springframework/data/gemfire/RegionFactoryBean.java
@@ -132,7 +132,7 @@ public class RegionFactoryBean<K, V> implements DisposableBean, FactoryBean<Regi
 	}
 
 	public void setBeanName(String beanName) {
-		this.beanName = name;
+		this.beanName = beanName;
 	}
 
 	/**