From cf510d447e53706f0d7997775c25a058a6cd17a9 Mon Sep 17 00:00:00 2001 From: David McKnight Date: Fri, 28 Jun 2013 09:30:34 -0400 Subject: [PATCH] [409785] When copying a file from a network location (e.g. \\myserver\xxx\abc.cpp) to a mapped local location in RSE, workbench hangs on this filecopy --- .../rse/subsystems/files/core/subsystems/RemoteFile.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/subsystems/files/core/subsystems/RemoteFile.java b/rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/subsystems/files/core/subsystems/RemoteFile.java index a8e2f1c7fd9..7f661935d36 100644 --- a/rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/subsystems/files/core/subsystems/RemoteFile.java +++ b/rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/subsystems/files/core/subsystems/RemoteFile.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2002, 2012 IBM Corporation and others. + * Copyright (c) 2002, 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 @@ -25,6 +25,7 @@ * David McKnight (IBM) - [283033] remoteFileTypes extension point should include "xml" type * David McKnight (IBM) - [328098] infinite loop when opening file from an UNC path * Rob Stryker (Red Hat) - [393384] isArchive returning true on remote folders ending in .jar + * David McKnight (IBM) - [409785] When copying a file from a network location (e.g. \\myserver\xxx\abc.cpp) to a mapped local location in RSE, workbench hangs on this filecopy *******************************************************************************/ package org.eclipse.rse.subsystems.files.core.subsystems; @@ -1166,6 +1167,9 @@ public abstract class RemoteFile implements IRemoteFile, IAdaptable, Comparable { return separator; } + else if (path.equals("\\")){ //$NON-NLS-1$ + return null; // for mapped network folder, there may not be a drive + } else if (lastSep > 0) { return path.substring(0, lastSep);