mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-07-04 23:55:26 +02:00
Code Issues Wiki Activity

[211551] fix: NPE when moving multiple folders from one tar file to another tar file

Browse source
This commit is contained in:
Xuan Chen 2007-11-30 17:59:46 +00:00
parent 78845993fb
commit 48ef3db9b8
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
rse/plugins/org.eclipse.rse.services/clientserver/org/eclipse/rse/services/clientserver/archiveutils/SystemTarHandler.java
View file

@ -18,6 +18,7 @@
* Xuan Chen (IBM) - [160775] [api] rename (at least within a zip) blocks UI thread
* Xuan Chen (IBM) - [209828] Need to move the Create operation to a job.
* Xuan Chen (IBM) - [209825] Update SystemTarHandler so that archive operations could be cancelable.
* Xuan Chen (IBM) - [211551] NPE when moving multiple folders from one tar file to another tar file
*******************************************************************************/
package org.eclipse.rse.services.clientserver.archiveutils;
@ -678,8 +679,10 @@ public class SystemTarHandler implements ISystemArchiveHandler {
// only add those entries that have names that begin with the parent name
// also check that the entry name isn't just the parent name + '/' (i.e. still the same
// as the parent)
if (entry.getName().startsWith(parent) && !entry.getName().equals(parent + "/")) { //$NON-NLS-1$
VirtualChild child = new VirtualChild(this, entry.getName());
String entryName = entry.getName();
String parentNameEndWithSlash = parent + "/"; //$NON-NLS-1$
if (entryName.startsWith(parentNameEndWithSlash) && !entryName.equals(parentNameEndWithSlash)) {
VirtualChild child = new VirtualChild(this, entryName);
child.isDirectory = entry.isDirectory();
v.add(child);
}