Attachment 189745 Details for Bug 280451 – patch to throw Runtime exception on conversion error

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

[patch] patch to throw Runtime exception on conversion error

patch.txt (text/plain), 4.17 KB, created by David McKnight

on 2011-02-24 15:45:50 EST

(hide)

Description:

Filename:

MIME Type:

Creator: David McKnight

Created: 2011-02-24 15:45:50 EST

Size: 4.17 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.rse.services
>Index: src/org/eclipse/rse/services/files/DefaultFileServiceCodePageConverter.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.tm.rse/plugins/org.eclipse.rse.services/src/org/eclipse/rse/services/files/DefaultFileServiceCodePageConverter.java,v
>retrieving revision 1.8
>diff -u -r1.8 DefaultFileServiceCodePageConverter.java
>--- src/org/eclipse/rse/services/files/DefaultFileServiceCodePageConverter.java	8 Sep 2010 11:26:15 -0000	1.8
>+++ src/org/eclipse/rse/services/files/DefaultFileServiceCodePageConverter.java	24 Feb 2011 20:45:21 -0000
>@@ -1,5 +1,5 @@
> /********************************************************************************
>- * Copyright (c) 2007, 2010 IBM Corporation. All rights reserved.
>+ * Copyright (c) 2007, 2011 IBM Corporation. All rights reserved.
>  * This program and the accompanying materials are made available under the terms
>  * of the Eclipse Public License v1.0 which accompanies this distribution, and is
>  * available at http://www.eclipse.org/legal/epl-v10.html
>@@ -14,6 +14,7 @@
>  * David McKnight    (IBM)  -[246857] Rename problem when a file is opened in the editor
>  * David McKnight    (IBM)  -[279014] [dstore][encoding] text file corruption can occur when downloading from UTF8 to cp1252
>  * David McKnight    (IBM)  -[324669] [dstore] IBM-eucJP to UTF-8 char conversion appends nulls to end of file during text-mode download
>+ * David McKnight    (IBM)  -[280451] IFileServiceCodePageConverter.convertClientStringToRemoteBytes() should throw runtime exception
>  ********************************************************************************/
> package org.eclipse.rse.services.files;
> 
>@@ -42,8 +43,9 @@
> 		}
> 		catch (Exception e)
> 		{
>+			// outstream could not be written properly: report
>+			throw new RuntimeException(e);
> 		}
>-		return clientString.getBytes();
> 	}
> 
> 	public void convertFileFromRemoteEncoding(String remotePath, File file, String remoteEncoding,
>Index: src/org/eclipse/rse/services/files/IFileServiceCodePageConverter.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.tm.rse/plugins/org.eclipse.rse.services/src/org/eclipse/rse/services/files/IFileServiceCodePageConverter.java,v
>retrieving revision 1.6
>diff -u -r1.6 IFileServiceCodePageConverter.java
>--- src/org/eclipse/rse/services/files/IFileServiceCodePageConverter.java	10 Jun 2009 23:45:36 -0000	1.6
>+++ src/org/eclipse/rse/services/files/IFileServiceCodePageConverter.java	24 Feb 2011 20:45:21 -0000
>@@ -1,5 +1,5 @@
> /********************************************************************************
>- * Copyright (c) 2007, 2009 IBM Corporation. All rights reserved.
>+ * Copyright (c) 2007, 2011 IBM Corporation. All rights reserved.
>  * This program and the accompanying materials are made available under the terms
>  * of the Eclipse Public License v1.0 which accompanies this distribution, and is
>  * available at http://www.eclipse.org/legal/epl-v10.html
>@@ -12,6 +12,7 @@
>  * David McKnight    (IBM)  -[209704] [api] Ability to override default encoding conversion needed.
>  * David McKnight    (IBM)  -[220379] [api] Provide a means for contributing custom BIDI encodings
>  * David McKnight    (IBM)  -[279014] [dstore][encoding] text file corruption can occur when downloading from UTF8 to cp1252
>+ * David McKnight    (IBM)  -[280451] IFileServiceCodePageConverter.convertClientStringToRemoteBytes() should throw runtime exception
>  ********************************************************************************/
> 
> package org.eclipse.rse.services.files;
>@@ -36,6 +37,7 @@
> 	 * @param fs                The file service to apply conversion to.
> 	 *                          Can be used to determine implementation specific settings to the converter
> 	 * @return					The bytes to upload to the server
>+	 * @throws RuntimeException (wrapping a CharacterCodingException or IOException) in case of an error transposing from source to target encoding
> 	 */
> 	public byte [] convertClientStringToRemoteBytes(String remotePath, String clientString, String remoteEncoding, IFileService fs);
>

Actions: View | Diff

Attachments on bug 280451: 189745