Backported:

	rv3090: Fix updater going into a nasty loop if checking is disabled
	rv3048: Fix CME in CommandParser


git-svn-id: http://svn.dmdirc.com/branches/0.5.5@3096 00569f92-eb28-0410-84fd-f71c24880f

src/com/dmdirc/commandparser/parsers/CommandParser.java

@@ -172,11 +172,14 @@ public abstract class CommandParser implements Serializable {
             builder.append(arg);
         }
         
-        history.add(new PreviousCommand(builder.toString()));
-        
-        while (history.size() >
-                IdentityManager.getGlobalConfig().getOptionInt("general", "commandhistory", 10)) {
-            history.remove(0);
+        synchronized(history) {
+            history.add(new PreviousCommand(builder.toString()));
+
+            int historysize = IdentityManager.getGlobalConfig().getOptionInt("general",
+                    "commandhistory", 10);
+            while (history.size() > historysize) {
+                history.remove(0);
+            }
         }
     }
     
@@ -189,10 +192,12 @@ public abstract class CommandParser implements Serializable {
      */
     public long getCommandTime(final String command) {
         long res = 0;
-        
-        for (PreviousCommand pc : history) {
-            if (pc.getLine().matches("(?i)" + command)) {
-                res = Math.max(res, pc.getTime());
+
+        synchronized(history) {
+            for (PreviousCommand pc : history) {
+                if (pc.getLine().matches("(?i)" + command)) {
+                    res = Math.max(res, pc.getTime());
+                }
             }
         }
         

src/com/dmdirc/updater/UpdateChecker.java

@@ -119,6 +119,9 @@ public final class UpdateChecker implements Runnable {
         final ConfigManager config = IdentityManager.getGlobalConfig();
 
         if (!config.getOptionBool("updater", "enable", true)) {
+            IdentityManager.getConfigIdentity().setOption("updater",
+                    "lastcheck", String.valueOf((int) (new Date().getTime() / 1000)));
+        
             init();
             return;
         }