1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-07-04 15:45:25 +02:00

Bug 314461 - [local] NPE trying to delete a local folder that has no permissions at all

This commit is contained in:
Martin Oberhuber 2010-05-26 17:02:01 +00:00
parent 91cd5404a9
commit 61650e40e5
2 changed files with 14 additions and 9 deletions

View file

@ -36,7 +36,7 @@ plugin@org.eclipse.rse.processes.ui=v201003010830,:pserver:anonymous:none@dev.ec
plugin@org.eclipse.rse.sdk=v201003151933,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.sdk
plugin@org.eclipse.rse.services.dstore=v201005200200,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.services.dstore
plugin@org.eclipse.rse.services.files.ftp=v201004072040,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.services.files.ftp
plugin@org.eclipse.rse.services.local=v201003010830,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.services.local
plugin@org.eclipse.rse.services.local=v201005261700,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.services.local
plugin@org.eclipse.rse.services.ssh=v200909160005,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.services.ssh
plugin@org.eclipse.rse.services.telnet=v200905272300,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.services.telnet
plugin@org.eclipse.rse.services=v201005221100,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.services

View file

@ -45,6 +45,7 @@
* Martin Oberhuber (Wind River) - [285942] Throw exception when listing a non-folder
* Martin Oberhuber (Wind River) - [286129][api] RemoteFileException(String) violates API contract
* David McKnight (IBM) - [299140] Local Readonly file can't be copied/pasted twice
* Martin Oberhuber (Wind River) - [314461] NPE deleting a folder w/o permission
*******************************************************************************/
package org.eclipse.rse.internal.services.local.files;
@ -1101,16 +1102,20 @@ public class LocalFileService extends AbstractFileService implements ILocalServi
{
boolean result = true;
File[] files = folder.listFiles();
for (int i = 0; i < files.length && result; i++)
if (files!=null)
{
File file = files[i];
if (file.isDirectory())
//bug 314461: java.io.File returns null if folder has no permissions
for (int i = 0; i < files.length && result; i++)
{
result = deleteContents(file, monitor);
}
else
{
result = file.delete();
File file = files[i];
if (file.isDirectory())
{
result = deleteContents(file, monitor);
}
else
{
result = file.delete();
}
}
}
if (result)