Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Valenta2004-03-16 17:10:40 -0500
committerMichael Valenta2004-03-16 17:10:40 -0500
commit90d78c9e317884f68e4dd6b1e904909576f21883 (patch)
treec615de1852b4a65fe86617200c67541d5138ddbf
parent1c696af9abb2e805e984652fe944149d71d4b7e3 (diff)
downloadeclipse.platform.team-branch_I20040315.tar.gz
eclipse.platform.team-branch_I20040315.tar.xz
eclipse.platform.team-branch_I20040315.zip
Temporary fix to 55028branch_I20040315
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/SubscriberCommitOperation.java22
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;
}

Back to the top