Attachment 83866 Details for Bug 210555 – Fix for the NPE

[patch] Fix for the NPE

patch_210555.txt (text/plain), 3.65 KB, created by Xuan Chen

on 2007-11-27 10:03:53 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Xuan Chen

Created: 2007-11-27 10:03:53 EST

Size: 3.65 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.rse.services
>Index: src/org/eclipse/rse/services/files/AbstractFileService.java
>===================================================================
>RCS file: /cvsroot/dsdp/org.eclipse.tm.rse/plugins/org.eclipse.rse.services/src/org/eclipse/rse/services/files/AbstractFileService.java,v
>retrieving revision 1.19
>diff -u -r1.19 AbstractFileService.java
>--- src/org/eclipse/rse/services/files/AbstractFileService.java	24 Nov 2007 00:36:27 -0000	1.19
>+++ src/org/eclipse/rse/services/files/AbstractFileService.java	27 Nov 2007 15:02:57 -0000
>@@ -19,6 +19,7 @@
>  * David McKnight   (IBM)        - [210109] store constants in IFileService rather than IFileServiceConstants
>  * Martin Oberhuber (Wind River) - [210109] no need to declare IFileService constants in AbstractFileService
>  * David McKnight   (IBM)        - [209704] [api] Ability to override default encoding conversion needed.
>+ * Xuan Chen        (IBM)        - [210555] [regression] NPE when deleting a file on SSH
>  ********************************************************************************/
> 
> package org.eclipse.rse.services.files;
>@@ -131,14 +132,9 @@
> 	public boolean deleteBatch(String[] remoteParents, String[] fileNames, IProgressMonitor monitor) throws SystemMessageException
> 	{
> 		boolean ok = true;
>-		SystemMessage msg = getMessage("RSEF1315");   //$NON-NLS-1$
>-		String deletingMessage = msg.makeSubstitution("").getLevelOneText(); //$NON-NLS-1$
>-		monitor.beginTask(deletingMessage, remoteParents.length);
> 		for (int i = 0; i < remoteParents.length; i++)
> 		{
>-			monitor.subTask(msg.makeSubstitution(fileNames[i]).getLevelOneText());
> 			ok = ok && delete(remoteParents[i], fileNames[i], monitor);
>-			monitor.worked(1);
> 		}
> 		return ok;
> 	}
>#P org.eclipse.rse.services.local
>Index: src/org/eclipse/rse/internal/services/local/files/LocalFileService.java
>===================================================================
>RCS file: /cvsroot/dsdp/org.eclipse.tm.rse/plugins/org.eclipse.rse.services.local/src/org/eclipse/rse/internal/services/local/files/LocalFileService.java,v
>retrieving revision 1.20
>diff -u -r1.20 LocalFileService.java
>--- src/org/eclipse/rse/internal/services/local/files/LocalFileService.java	16 Nov 2007 16:20:10 -0000	1.20
>+++ src/org/eclipse/rse/internal/services/local/files/LocalFileService.java	27 Nov 2007 15:02:58 -0000
>@@ -26,6 +26,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.
>  * David McKnight   (IBM)        - [210109] store constants in IFileService rather than IFileServiceConstants
>+ * Xuan Chen        (IBM)        - [210555] [regression] NPE when deleting a file on SSH
>  ********************************************************************************/
> 
> package org.eclipse.rse.internal.services.local.files;
>@@ -1034,6 +1035,21 @@
> 		}
> 	}
> 	
>+	public boolean deleteBatch(String[] remoteParents, String[] fileNames, IProgressMonitor monitor) throws SystemMessageException
>+	{
>+		boolean ok = true;
>+		SystemMessage msg = getMessage("RSEF1315");   //$NON-NLS-1$
>+		String deletingMessage = msg.makeSubstitution("").getLevelOneText(); //$NON-NLS-1$
>+		monitor.beginTask(deletingMessage, remoteParents.length);
>+		for (int i = 0; i < remoteParents.length; i++)
>+		{
>+			monitor.subTask(msg.makeSubstitution(fileNames[i]).getLevelOneText());
>+			ok = ok && delete(remoteParents[i], fileNames[i], monitor);
>+			monitor.worked(1);
>+		}
>+		return ok;
>+	}
>+	
> 	private boolean deleteContents(File folder, IProgressMonitor monitor)
> 	{
> 		boolean result = true;

Actions: View | Diff

Attachments on bug 210555: 83866