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

[255699] NPE when filter string doesn't return result in FileServiceSubSystem.list

Browse source
This commit is contained in:
David McKnight 2008-11-20 20:51:28 +00:00
parent 063b239e0a
commit d43849229b
1 changed files with 15 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
rse/plugins/org.eclipse.rse.subsystems.files.dstore/src/org/eclipse/rse/internal/subsystems/files/dstore/DStoreFileAdapter.java
View file

@ -15,6 +15,7 @@
* David McKnight (IBM) - [207178] changing list APIs for file service and subsystems * David McKnight (IBM) - [207178] changing list APIs for file service and subsystems
* Martin Oberhuber (Wind River) - [235363][api][breaking] IHostFileToRemoteFileAdapter methods should return AbstractRemoteFile * Martin Oberhuber (Wind River) - [235363][api][breaking] IHostFileToRemoteFileAdapter methods should return AbstractRemoteFile
* David McKnight (IBM) - [244765] Invalid thread access during workbench termination * David McKnight (IBM) - [244765] Invalid thread access during workbench termination
* David McKnight (IBM) - [255699] NPE when filter string doesn't return result in FileServiceSubSystem.list
*******************************************************************************/ *******************************************************************************/
package org.eclipse.rse.internal.subsystems.files.dstore; package org.eclipse.rse.internal.subsystems.files.dstore;
@ -64,19 +65,21 @@ public class DStoreFileAdapter implements IHostFileToRemoteFileAdapter
{ {
DStoreHostFile node = (DStoreHostFile)nodes[i]; DStoreHostFile node = (DStoreHostFile)nodes[i];
DStoreFile lfile = null; if (node != null){
DStoreFile lfile = null;
if (node instanceof DStoreVirtualHostFile)
{ if (node instanceof DStoreVirtualHostFile)
lfile = new DStoreVirtualFile(ss, context, parent, (DStoreVirtualHostFile) node); {
lfile = new DStoreVirtualFile(ss, context, parent, (DStoreVirtualHostFile) node);
}
else
{
lfile = new DStoreFile(ss, context, parent, node);
}
results.add(lfile);
ss.cacheRemoteFile(lfile);
} }
else
{
lfile = new DStoreFile(ss, context, parent, node);
}
results.add(lfile);
ss.cacheRemoteFile(lfile);
} }
return (DStoreFile[]) results.toArray(new DStoreFile[results.size()]); return (DStoreFile[]) results.toArray(new DStoreFile[results.size()]);