From af28c5726353a3f26f4d20d7d198a1dc0351b002 Mon Sep 17 00:00:00 2001 From: David McKnight Date: Wed, 6 Mar 2013 11:34:26 -0500 Subject: [PATCH] [402533] UniversalFileTransferUtility threw NPE --- .../files/ui/resources/UniversalFileTransferUtility.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) 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 551dc5508eb..1d53443bea3 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 @@ -65,6 +65,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; @@ -1551,7 +1552,9 @@ public class UniversalFileTransferUtility { { try { - targetFolder = targetFS.getRemoteFileObject(targetFolder.getAbsolutePath(), monitor); + IRemoteFile currentTargetFolder = targetFS.getRemoteFileObject(targetFolder.getAbsolutePath(), monitor); + if (currentTargetFolder != null) + targetFolder = currentTargetFolder; } catch (Exception e) {