From f40260acef8ca6a9deff7c005b2b9d70816b1ef2 Mon Sep 17 00:00:00 2001
From: ElgarL <ElgarL@palmergames.com>
Date: Mon, 7 Nov 2011 15:33:15 +0000
Subject: Minor optimization for Group loading/clone

---
 .../org/anjocaido/groupmanager/dataholder/WorldDataHolder.java    | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'EssentialsGroupManager/src/org/anjocaido/groupmanager/dataholder/WorldDataHolder.java')

diff --git a/EssentialsGroupManager/src/org/anjocaido/groupmanager/dataholder/WorldDataHolder.java b/EssentialsGroupManager/src/org/anjocaido/groupmanager/dataholder/WorldDataHolder.java
index 80291d066..8f5fad5cf 100644
--- a/EssentialsGroupManager/src/org/anjocaido/groupmanager/dataholder/WorldDataHolder.java
+++ b/EssentialsGroupManager/src/org/anjocaido/groupmanager/dataholder/WorldDataHolder.java
@@ -334,11 +334,13 @@ public class WorldDataHolder {
     		// transfer new data
     		resetGroups();
     		for (Group tempGroup : ph.getGroupList()) {
-    			if (tempGroup.getDataSource() != null)  tempGroup.clone(this);
+    			tempGroup.clone(this);
     		}
     		this.setDefaultGroup(this.getGroup(ph.getDefaultGroup().getName()));
     		this.removeGroupsChangedFlag();
     		this.timeStampGroups = ph.getTimeStampGroups();
+    		
+    		ph = null;
     	} catch (Exception ex) {
             Logger.getLogger(WorldDataHolder.class.getName()).log(Level.WARNING, null, ex);
         }
@@ -355,7 +357,7 @@ public class WorldDataHolder {
     		WorldDataHolder ph = new WorldDataHolder(this.getName());
     		// copy groups for reference
     		for (Group tempGroup : this.getGroupList()) {
-    			if (tempGroup.getDataSource() != null) tempGroup.clone(ph);
+    			tempGroup.clone(ph);
     		}
     		// setup the default group before loading user data.
     		ph.setDefaultGroup(ph.getGroup(this.getDefaultGroup().getName()));
@@ -367,6 +369,8 @@ public class WorldDataHolder {
     		}
     		this.removeUsersChangedFlag();
     		this.timeStampUsers = ph.getTimeStampUsers();
+    		
+    		ph = null;
     	} catch (Exception ex) {
             Logger.getLogger(WorldDataHolder.class.getName()).log(Level.WARNING, null, ex);
         } 
-- 
cgit v1.2.3