[Esbox-commits] r2256 - branches/work_Ed/org.maemo.esbox.vm/src/org/maemo/esbox/internal/api/vm/core

[eswartz at garage.maemo.org]

Author: eswartz
Date: 2009-10-02 21:34:20 +0300 (Fri, 02 Oct 2009)
New Revision: 2256

Modified:
   branches/work_Ed/org.maemo.esbox.vm/src/org/maemo/esbox/internal/api/vm/core/BaseVirtualMachineConfiguration.java
Log:
-- Avoid bogus "machine changed" due to SSH_TIMEOUT
-- Don't consider it an error not to consume the password

Modified: branches/work_Ed/org.maemo.esbox.vm/src/org/maemo/esbox/internal/api/vm/core/BaseVirtualMachineConfiguration.java
===================================================================
--- branches/work_Ed/org.maemo.esbox.vm/src/org/maemo/esbox/internal/api/vm/core/BaseVirtualMachineConfiguration.java	2009-10-02 16:52:07 UTC (rev 2255)
+++ branches/work_Ed/org.maemo.esbox.vm/src/org/maemo/esbox/internal/api/vm/core/BaseVirtualMachineConfiguration.java	2009-10-02 18:34:20 UTC (rev 2256)
@@ -85,7 +85,9 @@
 				String string = iterator.next();
 				Matcher matcher = itemPattern.matcher(string);
 				if (matcher.find()) {
-					if (!registeredKeys.contains(matcher.group(1)))
+					String key = matcher.group(1);
+					// N.B. ssh is not configurable yet
+					if (!registeredKeys.contains(key) || key.equals(VirtualMachinePreferenceConstants.VM_SSH_TIMEOUT))
 						iterator.remove();
 				}
 			}