|
Lines 18-23
Link Here
|
| 18 |
* Xuan Chen (IBM) - [215863]] NPE when Expanding Empty Zip File |
18 |
* Xuan Chen (IBM) - [215863]] NPE when Expanding Empty Zip File |
| 19 |
* Martin Oberhuber (Wind River) - [199854][api] Improve error reporting for archive handlers |
19 |
* Martin Oberhuber (Wind River) - [199854][api] Improve error reporting for archive handlers |
| 20 |
* David McKnight (IBM) - [251744] Backport [dstore] problems querying symbolic link folder |
20 |
* David McKnight (IBM) - [251744] Backport [dstore] problems querying symbolic link folder |
|
|
21 |
* Noriaki Takatsu (IBM) - [256724] thread-level security is not established |
| 21 |
*******************************************************************************/ |
22 |
*******************************************************************************/ |
| 22 |
|
23 |
|
| 23 |
package org.eclipse.rse.internal.dstore.universal.miners.filesystem; |
24 |
package org.eclipse.rse.internal.dstore.universal.miners.filesystem; |
|
Lines 34-39
Link Here
|
| 34 |
import org.eclipse.dstore.core.model.DE; |
35 |
import org.eclipse.dstore.core.model.DE; |
| 35 |
import org.eclipse.dstore.core.model.DataElement; |
36 |
import org.eclipse.dstore.core.model.DataElement; |
| 36 |
import org.eclipse.dstore.core.model.DataStore; |
37 |
import org.eclipse.dstore.core.model.DataStore; |
|
|
38 |
import org.eclipse.dstore.core.server.SecuredThread; |
| 37 |
import org.eclipse.rse.dstore.universal.miners.IUniversalDataStoreConstants; |
39 |
import org.eclipse.rse.dstore.universal.miners.IUniversalDataStoreConstants; |
| 38 |
import org.eclipse.rse.services.clientserver.IServiceConstants; |
40 |
import org.eclipse.rse.services.clientserver.IServiceConstants; |
| 39 |
import org.eclipse.rse.services.clientserver.PathUtility; |
41 |
import org.eclipse.rse.services.clientserver.PathUtility; |
|
Lines 46-52
Link Here
|
| 46 |
/* |
48 |
/* |
| 47 |
* This utility class is for determining file types |
49 |
* This utility class is for determining file types |
| 48 |
*/ |
50 |
*/ |
| 49 |
public class FileClassifier extends Thread |
51 |
public class FileClassifier extends SecuredThread |
| 50 |
{ |
52 |
{ |
| 51 |
protected class Pair |
53 |
protected class Pair |
| 52 |
{ |
54 |
{ |
|
Lines 129-134
Link Here
|
| 129 |
|
131 |
|
| 130 |
public FileClassifier(DataElement subject) |
132 |
public FileClassifier(DataElement subject) |
| 131 |
{ |
133 |
{ |
|
|
134 |
super(subject.getDataStore()); |
| 132 |
_lines = new ArrayList(); |
135 |
_lines = new ArrayList(); |
| 133 |
// special encoding passed in when starting server |
136 |
// special encoding passed in when starting server |
| 134 |
_specialEncoding = System.getProperty("dstore.stdin.encoding"); //$NON-NLS-1$ |
137 |
_specialEncoding = System.getProperty("dstore.stdin.encoding"); //$NON-NLS-1$ |
|
Lines 259-264
Link Here
|
| 259 |
|
262 |
|
| 260 |
public void run() |
263 |
public void run() |
| 261 |
{ |
264 |
{ |
|
|
265 |
super.run(); |
| 262 |
if (!_systemSupportsClassify) |
266 |
if (!_systemSupportsClassify) |
| 263 |
return; |
267 |
return; |
| 264 |
init(); |
268 |
init(); |
|
Lines 291-297
Link Here
|
| 291 |
// if parent file is a directory, classify all its children, and |
295 |
// if parent file is a directory, classify all its children, and |
| 292 |
// do not |
296 |
// do not |
| 293 |
// resolve links by default |
297 |
// resolve links by default |
| 294 |
if (parentFile.isDirectory() && parentFile.list().length > 0) |
298 |
if ((parentFile != null) && parentFile.isDirectory() && parentFile.list().length > 0) |
| 295 |
{ |
299 |
{ |
| 296 |
classifyChildren(parentFile, "*", false); //$NON-NLS-1$ |
300 |
classifyChildren(parentFile, "*", false); //$NON-NLS-1$ |
| 297 |
} |
301 |
} |
