Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Valenta2002-03-22 11:34:50 -0500
committerMichael Valenta2002-03-22 11:34:50 -0500
commit6d106e4a5978f06c4e7b80db9ecfcd24f9535ada (patch)
treea110b514ffed90faf4ca4db2ace1235c8c6edf18
parente0404c13f28184c7203e32ba1ab39ad2f6c3f6fd (diff)
downloadeclipse.platform.team-6d106e4a5978f06c4e7b80db9ecfcd24f9535ada.tar.gz
eclipse.platform.team-6d106e4a5978f06c4e7b80db9ecfcd24f9535ada.tar.xz
eclipse.platform.team-6d106e4a5978f06c4e7b80db9ecfcd24f9535ada.zip
12065: Error on "Change Tag" acts fatal when shouldn't beroot_teamPrivateResources
- added code to ensure that the multistatus of a server error is not empty
-rw-r--r--bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/Command.java6
-rw-r--r--bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/messages.properties3
2 files changed, 7 insertions, 2 deletions
diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/Command.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/Command.java
index 4c5305012..9e52e6d63 100644
--- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/Command.java
+++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/Command.java
@@ -461,8 +461,12 @@ public abstract class Command {
if (response.equals("ok")) { //$NON-NLS-1$
break;
} else if (response.equals("error")) { //$NON-NLS-1$
- if (argument.trim().length() == 0)
+ if (argument.trim().length() == 0) {
argument = Policy.bind("Command.serverError", Policy.bind("Command." + getCommandId())); //$NON-NLS-1$ //$NON-NLS-2$
+ }
+ if (accumulatedStatus.isEmpty()) {
+ accumulatedStatus.add(new CVSStatus(CVSStatus.ERROR, CVSStatus.SERVER_ERROR, Policy.bind("Command.noMoreInfoAvailable")));
+ }
return new MultiStatus(CVSProviderPlugin.ID, CVSStatus.SERVER_ERROR,
(IStatus[]) accumulatedStatus.toArray(new IStatus[accumulatedStatus.size()]),
argument, null);
diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/messages.properties b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/messages.properties
index b94b9f915..3eced31a5 100644
--- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/messages.properties
+++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/messages.properties
@@ -115,12 +115,13 @@ Command.invalidRoot=Resource {0} is not a valid CVS root directory
Command.invalidResource=Resource {0} is not a valid CVS resource
Command.warnings=Warnings occured during CVS operation: {0}
Command.serverError=Error occured during CVS operation: {0}
+Command.noMoreInfoAvailable=The server did not provide any addition information.
Command.add=add
Command.admin=admin
Command.co=checkout
Command.ci=commit
Command.diff=diff
-Command.im=import
+Command.import=import
Command.log=log
Command.remove=remove
Command.status=status

Back to the top