From bc00fb852f3f63749e5adcd73a70ed7984f4ecc7 Mon Sep 17 00:00:00 2001
From: Greg Watson <g.watson@computer.org>
Date: Wed, 18 Mar 2015 16:48:17 -0400
Subject: [PATCH] Bug 462503 - Fix for ConnectionExistsException in Remote
 Connections preference page

Change-Id: Ib49d82a51568d99d7db4bcf0e4d39b00f8c444ed
Signed-off-by: Greg Watson <g.watson@computer.org>
---
 .../remote/internal/core/RemoteConnectionWorkingCopy.java  | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/bundles/org.eclipse.remote.core/src/org/eclipse/remote/internal/core/RemoteConnectionWorkingCopy.java b/bundles/org.eclipse.remote.core/src/org/eclipse/remote/internal/core/RemoteConnectionWorkingCopy.java
index a5cb0e311ca..98f1588da36 100644
--- a/bundles/org.eclipse.remote.core/src/org/eclipse/remote/internal/core/RemoteConnectionWorkingCopy.java
+++ b/bundles/org.eclipse.remote.core/src/org/eclipse/remote/internal/core/RemoteConnectionWorkingCopy.java
@@ -298,7 +298,6 @@ public class RemoteConnectionWorkingCopy implements IRemoteConnectionWorkingCopy
 		} catch (BackingStoreException e1) {
 			throw new RemoteConnectionException(e1);
 		}
-		newAttributes.clear();
 
 		ISecurePreferences securePrefs = original.getSecurePreferences();
 		for (Map.Entry<String, String> entry : newSecureAttributes.entrySet()) {
@@ -318,7 +317,13 @@ public class RemoteConnectionWorkingCopy implements IRemoteConnectionWorkingCopy
 		} catch (IOException e) {
 			throw new RemoteConnectionException(e);
 		}
+
+		/*
+		 * Reset state for isDirty()
+		 */
+		newAttributes.clear();
 		newSecureAttributes.clear();
+		newName = null;
 
 		connectionType.addConnection(original);
 		if (added) {