Temporary fix to 55028branch_I20040315

1 files changed, 12 insertions, 10 deletions

diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/SubscriberCommitOperation.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/SubscriberCommitOperation.java
index 78f87bd4f..a8b239722 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/SubscriberCommitOperation.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/SubscriberCommitOperation.java
@@ -62,19 +62,21 @@ public class SubscriberCommitOperation extends CVSSubscriberOperation {
 	 * @see org.eclipse.team.internal.ui.actions.SubscriberOperation#getSyncInfoSet()
 	 */
 	protected SyncInfoSet getSyncInfoSet() {
-		syncSet = super.getSyncInfoSet();
-		if (!promptForConflictHandling(syncSet)) {
-			syncSet.clear();
-			return syncSet;
-		}
-		try {
-			if (!promptForUnaddedHandling(syncSet)) {
+		if (syncSet == null) {
+			syncSet = super.getSyncInfoSet();
+			if (!promptForConflictHandling(syncSet)) {
 				syncSet.clear();
 				return syncSet;
 			}
-		} catch (CVSException e) {
-			Utils.handle(e);
-			syncSet.clear();
+			try {
+				if (!promptForUnaddedHandling(syncSet)) {
+					syncSet.clear();
+					return syncSet;
+				}
+			} catch (CVSException e) {
+				Utils.handle(e);
+				syncSet.clear();
+			}
 		}
 		return syncSet;
 	}