Attachment 118913 Details for Bug 256785 – backported patch

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

[patch] backported patch

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

on 2008-11-27 09:53:30 EST

(hide)

Description:

Filename:

MIME Type:

Creator: David McKnight

Created: 2008-11-27 09:53:30 EST

Size: 2.78 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.rse.services.dstore
>Index: miners/org/eclipse/rse/internal/dstore/universal/miners/filesystem/FileClassifier.java
>===================================================================
>RCS file: /cvsroot/dsdp/org.eclipse.tm.rse/plugins/org.eclipse.rse.services.dstore/miners/org/eclipse/rse/internal/dstore/universal/miners/filesystem/FileClassifier.java,v
>retrieving revision 1.10.2.1
>diff -u -r1.10.2.1 FileClassifier.java
>--- miners/org/eclipse/rse/internal/dstore/universal/miners/filesystem/FileClassifier.java	7 Nov 2008 21:47:20 -0000	1.10.2.1
>+++ miners/org/eclipse/rse/internal/dstore/universal/miners/filesystem/FileClassifier.java	27 Nov 2008 14:53:06 -0000
>@@ -18,6 +18,7 @@
>  * Xuan Chen        (IBM)        - [215863]] NPE when Expanding Empty Zip File
>  * Martin Oberhuber (Wind River) - [199854][api] Improve error reporting for archive handlers
>  * David McKnight   (IBM)        - [251744] Backport [dstore] problems querying symbolic link folder
>+ * Noriaki Takatsu  (IBM)        - [256724] thread-level security is not established
>  *******************************************************************************/
> 
> package org.eclipse.rse.internal.dstore.universal.miners.filesystem;
>@@ -34,6 +35,7 @@
> import org.eclipse.dstore.core.model.DE;
> import org.eclipse.dstore.core.model.DataElement;
> import org.eclipse.dstore.core.model.DataStore;
>+import org.eclipse.dstore.core.server.SecuredThread;
> import org.eclipse.rse.dstore.universal.miners.IUniversalDataStoreConstants;
> import org.eclipse.rse.services.clientserver.IServiceConstants;
> import org.eclipse.rse.services.clientserver.PathUtility;
>@@ -46,7 +48,7 @@
> /*
>  * This utility class is for determining file types
>  */
>-public class FileClassifier extends Thread
>+public class FileClassifier extends SecuredThread
> {
>     protected class Pair
>     {
>@@ -129,6 +131,7 @@
> 
>     public FileClassifier(DataElement subject)
>     {
>+    	super(subject.getDataStore());
>         _lines = new ArrayList();
>         // special encoding passed in when starting server
>         _specialEncoding = System.getProperty("dstore.stdin.encoding"); //$NON-NLS-1$
>@@ -259,6 +262,7 @@
> 
>     public void run()
>     {
>+    	super.run();
>         if (!_systemSupportsClassify)
>             return;
>         init();
>@@ -291,7 +295,7 @@
>                 // if parent file is a directory, classify all its children, and
>                 // do not
>                 // resolve links by default
>-                if (parentFile.isDirectory() && parentFile.list().length > 0)
>+                if ((parentFile != null) && parentFile.isDirectory() && parentFile.list().length > 0)
>                 {
>                     classifyChildren(parentFile, "*", false); //$NON-NLS-1$
>                 }

Actions: View | Diff

Attachments on bug 256785: 118913