mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-07-25 18:05:33 +02:00
Code Issues Wiki Activity

[191581][efs] clear local IRemoteFile handle cache when modifying remote

Browse source
This commit is contained in:
Martin Oberhuber 2007-08-02 16:09:29 +00:00
parent f7c5502c4e
commit abfbacb0ad
2 changed files with 27 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
rse/plugins/org.eclipse.rse.efs/META-INF/MANIFEST.MF
View file

@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2 Bundle-ManifestVersion: 2
Bundle-Name: %pluginName Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.rse.efs;singleton:=true Bundle-SymbolicName: org.eclipse.rse.efs;singleton:=true
Bundle-Version: 2.0.0.qualifier Bundle-Version: 2.0.1.qualifier
Bundle-Activator: org.eclipse.rse.internal.efs.Activator Bundle-Activator: org.eclipse.rse.internal.efs.Activator
Bundle-Localization: plugin Bundle-Localization: plugin
Require-Bundle: org.eclipse.core.runtime, Require-Bundle: org.eclipse.core.runtime,

46
rse/plugins/org.eclipse.rse.efs/src/org/eclipse/rse/internal/efs/RSEFileStoreImpl.java
View file

@ -19,6 +19,7 @@
* Martin Oberhuber (Wind River) - [186128] Move IProgressMonitor last in all API * Martin Oberhuber (Wind River) - [186128] Move IProgressMonitor last in all API
* Martin Oberhuber (Wind River) - [186773] split ISystemRegistryUI from ISystemRegistry * Martin Oberhuber (Wind River) - [186773] split ISystemRegistryUI from ISystemRegistry
* Martin Oberhuber (Wind River) - [188360] renamed from plugin org.eclipse.rse.eclipse.filesystem * Martin Oberhuber (Wind River) - [188360] renamed from plugin org.eclipse.rse.eclipse.filesystem
* Martin Oberhuber (Wind River) - [191581] clear local IRemoteFile handle cache when modifying remote
********************************************************************************/ ********************************************************************************/
package org.eclipse.rse.internal.efs; package org.eclipse.rse.internal.efs;
@ -243,6 +244,12 @@ public class RSEFileStoreImpl extends FileStore
return subSys; return subSys;
} }
/**
* Return the cached IRemoteFile handle. Used only as a handle into
* ISubSystem operations, attributes of this handle are never considered
* except for exists() checking.
* @return
*/
private IRemoteFile getCachedRemoteFile() { private IRemoteFile getCachedRemoteFile() {
return _remoteFile; return _remoteFile;
} }
@ -282,7 +289,7 @@ public class RSEFileStoreImpl extends FileStore
"Could not get remote file")); "Could not get remote file"));
} }
try { try {
remoteFile = parent.getParentRemoteFileSubSystem().getRemoteFileObject(parent, _parent.getName(), monitor); remoteFile = parent.getParentRemoteFileSubSystem().getRemoteFileObject(parent, getName(), monitor);
} catch(Exception e) { } catch(Exception e) {
throw new CoreException(new Status(IStatus.ERROR, throw new CoreException(new Status(IStatus.ERROR,
Activator.getDefault().getBundle().getSymbolicName(), Activator.getDefault().getBundle().getSymbolicName(),
@ -468,7 +475,8 @@ public class RSEFileStoreImpl extends FileStore
* @see org.eclipse.core.filesystem.IFileStore#fetchInfo(int, org.eclipse.core.runtime.IProgressMonitor) * @see org.eclipse.core.filesystem.IFileStore#fetchInfo(int, org.eclipse.core.runtime.IProgressMonitor)
*/ */
public IFileInfo fetchInfo(int options, IProgressMonitor monitor) throws CoreException { public IFileInfo fetchInfo(int options, IProgressMonitor monitor) throws CoreException {
// clear cache in order to query latest info
cacheRemoteFile(null);
// connect if needed. Will throw exception if not successful. // connect if needed. Will throw exception if not successful.
IRemoteFile remoteFile = getRemoteFileObject(monitor, false); IRemoteFile remoteFile = getRemoteFileObject(monitor, false);
@ -510,11 +518,11 @@ public class RSEFileStoreImpl extends FileStore
} }
if (remoteFile.isFile()) { if (remoteFile.isFile()) {
try { try {
return subSys.getInputStream(remoteFile.getParentPath(), remoteFile.getName(), true, monitor); return subSys.getInputStream(remoteFile.getParentPath(), remoteFile.getName(), true, monitor);
} }
catch (SystemMessageException e) { catch (SystemMessageException e) {
cacheRemoteFile(null);
throw new CoreException(new Status(IStatus.ERROR, throw new CoreException(new Status(IStatus.ERROR,
Activator.getDefault().getBundle().getSymbolicName(), Activator.getDefault().getBundle().getSymbolicName(),
"Could not get input stream", e)); "Could not get input stream", e));
@ -530,6 +538,7 @@ public class RSEFileStoreImpl extends FileStore
*/ */
public IFileStore mkdir(int options, IProgressMonitor monitor) throws CoreException public IFileStore mkdir(int options, IProgressMonitor monitor) throws CoreException
{ {
cacheRemoteFile(null);
IRemoteFile remoteFile = getRemoteFileObject(monitor, false); IRemoteFile remoteFile = getRemoteFileObject(monitor, false);
if (remoteFile==null) { if (remoteFile==null) {
throw new CoreException(new Status(IStatus.ERROR, throw new CoreException(new Status(IStatus.ERROR,
@ -540,6 +549,7 @@ public class RSEFileStoreImpl extends FileStore
if (!remoteFile.exists()) { if (!remoteFile.exists()) {
try { try {
remoteFile = subSys.createFolder(remoteFile, monitor); remoteFile = subSys.createFolder(remoteFile, monitor);
cacheRemoteFile(remoteFile);
} }
catch (Exception e) { catch (Exception e) {
throw new CoreException(new Status(IStatus.ERROR, throw new CoreException(new Status(IStatus.ERROR,
@ -563,7 +573,7 @@ public class RSEFileStoreImpl extends FileStore
* @see org.eclipse.core.filesystem.IFileStore#openOutputStream(int, org.eclipse.core.runtime.IProgressMonitor) * @see org.eclipse.core.filesystem.IFileStore#openOutputStream(int, org.eclipse.core.runtime.IProgressMonitor)
*/ */
public OutputStream openOutputStream(int options, IProgressMonitor monitor) throws CoreException { public OutputStream openOutputStream(int options, IProgressMonitor monitor) throws CoreException {
cacheRemoteFile(null);
IRemoteFile remoteFile = getRemoteFileObject(monitor, false); IRemoteFile remoteFile = getRemoteFileObject(monitor, false);
if (remoteFile==null) { if (remoteFile==null) {
throw new CoreException(new Status(IStatus.ERROR, throw new CoreException(new Status(IStatus.ERROR,
@ -574,6 +584,7 @@ public class RSEFileStoreImpl extends FileStore
if (!remoteFile.exists()) { if (!remoteFile.exists()) {
try { try {
remoteFile = subSys.createFile(remoteFile, monitor); remoteFile = subSys.createFile(remoteFile, monitor);
cacheRemoteFile(remoteFile);
} }
catch (Exception e) { catch (Exception e) {
throw new CoreException(new Status(IStatus.ERROR, throw new CoreException(new Status(IStatus.ERROR,
@ -583,7 +594,6 @@ public class RSEFileStoreImpl extends FileStore
} }
if (remoteFile.isFile()) { if (remoteFile.isFile()) {
try { try {
return subSys.getOutputStream(remoteFile.getParentPath(), remoteFile.getName(), true, monitor); return subSys.getOutputStream(remoteFile.getParentPath(), remoteFile.getName(), true, monitor);
} }
@ -611,24 +621,20 @@ public class RSEFileStoreImpl extends FileStore
public void delete(int options, IProgressMonitor monitor) throws CoreException public void delete(int options, IProgressMonitor monitor) throws CoreException
{ {
IRemoteFile remoteFile = getRemoteFileObject(monitor, false); IRemoteFile remoteFile = getRemoteFileObject(monitor, false);
if (remoteFile==null || !remoteFile.exists()) { IRemoteFileSubSystem subSys = remoteFile.getParentRemoteFileSubSystem();
return; try {
} cacheRemoteFile(null);
else { boolean success = subSys.delete(remoteFile, monitor);
IRemoteFileSubSystem subSys = remoteFile.getParentRemoteFileSubSystem(); if (!success) {
try {
boolean success = subSys.delete(remoteFile, monitor);
if (!success) {
throw new CoreException(new Status(IStatus.ERROR,
Activator.getDefault().getBundle().getSymbolicName(),
"Could not delete file"));
}
}
catch (Exception e) {
throw new CoreException(new Status(IStatus.ERROR, throw new CoreException(new Status(IStatus.ERROR,
Activator.getDefault().getBundle().getSymbolicName(), Activator.getDefault().getBundle().getSymbolicName(),
"Could not delete file", e)); "Could not delete file"));
} }
} }
catch (Exception e) {
throw new CoreException(new Status(IStatus.ERROR,
Activator.getDefault().getBundle().getSymbolicName(),
"Could not delete file", e));
}
} }
} }