Attachment 228008 Details for Bug 402540 – backport patch

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

[patch] backport patch

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

on 2013-03-06 12:10:01 EST

(hide)

Description:

Filename:

MIME Type:

Creator: David McKnight

Created: 2013-03-06 12:10:01 EST

Size: 1.83 KB

patch

obsolete

>diff --git a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/resources/UniversalFileTransferUtility.java b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/resources/UniversalFileTransferUtility.java
>index 1bf014d..27e48d7 100644
>--- a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/resources/UniversalFileTransferUtility.java
>+++ b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/resources/UniversalFileTransferUtility.java
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2006, 2012 IBM Corporation and others.
>+ * Copyright (c) 2006, 2013 IBM Corporation and others.
>  * 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
>@@ -64,6 +64,7 @@
>  * David McKnight     (IBM)      - [376410] cross-system copy/paste operation doesn't transfer remote encodings for binary files
>  * David McKnight     (IBM)      - [386486] when the original timestamp of a file is 0 don't set it after an upload
>  * David McKnight   (IBM)        - [389838] Fast folder transfer does not account for code page
>+ * Samuel Wu        (IBM)        - [402533] UniversalFileTransferUtility threw NPE
>  *******************************************************************************/
> 
> package org.eclipse.rse.files.ui.resources;
>@@ -1550,7 +1551,9 @@
> 		{
> 			try
> 			{
>-				targetFolder = targetFS.getRemoteFileObject(targetFolder.getAbsolutePath(), monitor);
>+				IRemoteFile currentTargetFolder = targetFS.getRemoteFileObject(targetFolder.getAbsolutePath(), monitor);
>+				if (currentTargetFolder != null)
>+					targetFolder = currentTargetFolder;
> 			}
> 			catch (Exception e)
> 			{

Actions: View | Diff

Attachments on bug 402540: 228008