From 022f7ab1d45492ce5cebba077cb4ffad8c637e9b Mon Sep 17 00:00:00 2001
From: ElgarL <ElgarL@palmergames.com>
Date: Thu, 17 Nov 2011 05:46:01 +0000
Subject: Fixed GM holding files open and causing the time stamp to be
 incorrect. This caused GM to require a '/mansave force' when it shouldn't be
 needed.

---
 .../anjocaido/groupmanager/dataholder/WorldDataHolder.java   | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 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 e8e01967f..7dbeea7b1 100644
--- a/EssentialsGroupManager/src/org/anjocaido/groupmanager/dataholder/WorldDataHolder.java
+++ b/EssentialsGroupManager/src/org/anjocaido/groupmanager/dataholder/WorldDataHolder.java
@@ -338,7 +338,7 @@ public class WorldDataHolder {
     		}
     		this.setDefaultGroup(this.getGroup(ph.getDefaultGroup().getName()));
     		this.removeGroupsChangedFlag();
-    		this.timeStampGroups = ph.getTimeStampGroups();
+    		this.timeStampGroups = getGroupsFile().lastModified();
     		
     		ph = null;
     	} catch (Exception ex) {
@@ -368,7 +368,7 @@ public class WorldDataHolder {
     			tempUser.clone(this);
     		}
     		this.removeUsersChangedFlag();
-    		this.timeStampUsers = ph.getTimeStampUsers();
+    		this.timeStampUsers = getUsersFile().lastModified();
     		
     		ph = null;
     	} catch (Exception ex) {
@@ -925,6 +925,7 @@ public class WorldDataHolder {
 	        	out.write(newLine);
 	        	
 	            yaml.dump(root, out);
+	            out.close();
 	        } catch (UnsupportedEncodingException ex) {
 	        } catch (FileNotFoundException ex) {
 	        } catch (IOException e) {
@@ -995,10 +996,13 @@ public class WorldDataHolder {
 	        opt.setDefaultFlowStyle(DumperOptions.FlowStyle.BLOCK);
 	        final Yaml yaml = new Yaml(opt);
 	        try {
-	            yaml.dump(root, new OutputStreamWriter(new FileOutputStream(usersFile), "UTF-8"));
+	        	OutputStreamWriter out = new OutputStreamWriter(new FileOutputStream(usersFile), "UTF-8");
+	            yaml.dump(root, out);
+	            out.close();
 	        } catch (UnsupportedEncodingException ex) {
 	        } catch (FileNotFoundException ex) {
-	        }
+	        } catch (IOException e) {
+			}
         }
         
         // Update the LastModified time.
-- 
cgit v1.2.3