27960: [CVS UI] Internal Error occurred checking out as project from CVS using an Italian locale

2 files changed, 9 insertions, 1 deletions

diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/Console.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/Console.java
index a2db10e14..a56e4a176 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/Console.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/Console.java
@@ -18,6 +18,7 @@ import java.text.SimpleDateFormat;
 
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.OperationCanceledException;
+import org.eclipse.core.runtime.Status;
 import org.eclipse.jface.action.Action;
 import org.eclipse.jface.action.IMenuListener;
 import org.eclipse.jface.action.IMenuManager;
@@ -411,7 +412,13 @@ public class Console extends ViewPart {
 		}
 		public void commandCompleted(IStatus status, Exception exception) {
 			long commandRuntime = System.currentTimeMillis() - commandStarted;
-			String time = TIME_FORMAT.format(new Date(commandRuntime));
+			String time;
+			try {
+				time = TIME_FORMAT.format(new Date(commandRuntime));
+			} catch (RuntimeException e) {
+				CVSUIPlugin.log(new Status(IStatus.ERROR, CVSUIPlugin.ID, 0, Policy.bind("Console.couldNotFormatTime"), e)); //$NON-NLS-1$
+				time = "";
+			}
 			String statusText;
 			if (status != null) {
 				if (status.getCode() == CVSStatus.SERVER_ERROR) {
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/messages.properties b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/messages.properties
index 77b67f1d7..a8bb98879 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/messages.properties
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/messages.properties
@@ -307,6 +307,7 @@ Console.resultException=failed due to an internal error {0}
 Console.resultAborted=operation canceled {0}
 Console.resultOk=ok {0}
 Console.resultTimeFormat='(took 'm:ss.SSS')'
+Console.couldNotFormatTime=An error occured formatting the output time for the CVS console.
 Console.preExecutionDelimiter=***
 Console.postExecutionDelimiter=***
 Console.info=Info: {0}