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.

2 files changed, 10 insertions, 5 deletions

diff --git a/EssentialsGroupManager/src/Changelog.txt b/EssentialsGroupManager/src/Changelog.txt
index d71bc135a..6a7fd1795 100644
--- a/EssentialsGroupManager/src/Changelog.txt
+++ b/EssentialsGroupManager/src/Changelog.txt
@@ -70,4 +70,5 @@ v 1.5:
 	  If the files on Disc have changed AND there have been changes to it's in-memory data it will show a warning.

 	  You then MUST issue a '/mansave force' to overwrite the disc files, or a '/manload' to overwrite the memory data.

 	- Fix for an error in checkFullUserPermission caused by players disconnecting mid perms update.

-	- Notification of being moved to the default group only happens if it's a demotion/promotion (not on join).
\ No newline at end of file
+	- Notification of being moved to the default group only happens if it's a demotion/promotion (not on join).

+	- 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.
\ No newline at end of file
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.