1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-06-09 02:36:01 +02:00

Merge "Bug 462503 - Fix for ConnectionExistsException in Remote Connections preference page"

This commit is contained in:
Greg Watson 2015-03-18 17:33:42 -04:00 committed by Gerrit Code Review @ Eclipse.org
commit 62dcd2bc81

View file

@ -298,7 +298,6 @@ public class RemoteConnectionWorkingCopy implements IRemoteConnectionWorkingCopy
} catch (BackingStoreException e1) { } catch (BackingStoreException e1) {
throw new RemoteConnectionException(e1); throw new RemoteConnectionException(e1);
} }
newAttributes.clear();
ISecurePreferences securePrefs = original.getSecurePreferences(); ISecurePreferences securePrefs = original.getSecurePreferences();
for (Map.Entry<String, String> entry : newSecureAttributes.entrySet()) { for (Map.Entry<String, String> entry : newSecureAttributes.entrySet()) {
@ -318,7 +317,13 @@ public class RemoteConnectionWorkingCopy implements IRemoteConnectionWorkingCopy
} catch (IOException e) { } catch (IOException e) {
throw new RemoteConnectionException(e); throw new RemoteConnectionException(e);
} }
/*
* Reset state for isDirty()
*/
newAttributes.clear();
newSecureAttributes.clear(); newSecureAttributes.clear();
newName = null;
connectionType.addConnection(original); connectionType.addConnection(original);
if (added) { if (added) {