Attachment 152898 Details for Bug 295923 – backport fix

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

[patch] backport fix

patch.txt (text/plain), 2.99 KB, created by David McKnight

on 2009-11-23 15:25:30 EST

(hide)

Description:

Filename:

MIME Type:

Creator: David McKnight

Created: 2009-11-23 15:25:30 EST

Size: 2.99 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.rse.services.dstore
>Index: miners/org/eclipse/rse/internal/dstore/universal/miners/filesystem/CopyThread.java
>===================================================================
>RCS file: /cvsroot/dsdp/org.eclipse.tm.rse/plugins/org.eclipse.rse.services.dstore/miners/org/eclipse/rse/internal/dstore/universal/miners/filesystem/CopyThread.java,v
>retrieving revision 1.5
>diff -u -r1.5 CopyThread.java
>--- miners/org/eclipse/rse/internal/dstore/universal/miners/filesystem/CopyThread.java	12 Apr 2008 00:19:43 -0000	1.5
>+++ miners/org/eclipse/rse/internal/dstore/universal/miners/filesystem/CopyThread.java	23 Nov 2009 20:28:41 -0000
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2007, 2008 IBM Corporation and others.
>+ * Copyright (c) 2007, 2009 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
>@@ -12,6 +12,7 @@
>  * Contributors:
>  * Xuan Chen (IBM) - [209827] Update DStore command implementation to enable cancelation of archive operations
>  * Noriaki Takatsu (IBM)  - [220126] [dstore][api][breaking] Single process server for multiple clients
>+ * David McKnight  (IBM)  - [290290] [dstore] Error message when copy a file from another users folder
>  *******************************************************************************/
> package org.eclipse.rse.internal.dstore.universal.miners.filesystem;
> 
>@@ -200,6 +201,38 @@
> 					    err = err.substring(0, err.length() - newLine.length());
> 					}
> 					
>+					String theOS = System.getProperty("os.name"); //$NON-NLS-1$
>+					boolean isZ = theOS.toLowerCase().startsWith("z"); //$NON-NLS-1$
>+					// special case for bug 290290 - which only occurs on z/OS
>+					if (isZ && err.startsWith("cp: FSUM8985")){ //$NON-NLS-1$
>+						// attempt against without the -p
>+						if (folderCopy) {
>+							command = "cp  -R " + source + " " + tgt; //$NON-NLS-1$ //$NON-NLS-2$
>+						}
>+						else {
>+							command = "cp " + source + " " + tgt; //$NON-NLS-1$ //$NON-NLS-2$
>+						}
>+						String theShell = "sh"; //$NON-NLS-1$
>+						String args[] = new String[3];
>+						args[0] = theShell;					
>+						args[1] = "-c"; //$NON-NLS-1$
>+						args[2] = command;
>+														
>+						p = runtime.exec(args);
>+						
>+					    // wait for process to finish
>+					    p.waitFor();
>+					    
>+					    // get the exit value of the process
>+					   result = p.exitValue();
>+					    
>+					    // if the exit value is not 0, then the process did not terminate normally
>+					    if (result == 0) {
>+					    	status.setAttribute(DE.A_SOURCE, IServiceConstants.SUCCESS);
>+					    	return;
>+					    }
>+					}
>+					
> 					// if there is something in error buffer
> 					// there was something in the error stream of the process
> 					if (err.length() > 0) {

Actions: View | Diff

Attachments on bug 295923: 152898