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

[244277] [dstore] NPE on file save from old client

Browse source
This commit is contained in:
David McKnight 2008-08-20 17:12:47 +00:00
parent 6aad347cdf
commit 42e3f6e907
1 changed files with 37 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
rse/plugins/org.eclipse.rse.services.dstore/miners/org/eclipse/rse/dstore/universal/miners/UniversalFileSystemMiner.java
View file

@ -35,6 +35,7 @@
* David McKnight (IBM) [225507] [api][breaking] RSE dstore API leaks non-API types * David McKnight (IBM) [225507] [api][breaking] RSE dstore API leaks non-API types
* Martin Oberhuber (Wind River) - [199854][api] Improve error reporting for archive handlers * Martin Oberhuber (Wind River) - [199854][api] Improve error reporting for archive handlers
* David McKnight (IBM) - [226561] [apidoc] Add API markup to RSE Javadocs where extend / implement is allowed * David McKnight (IBM) - [226561] [apidoc] Add API markup to RSE Javadocs where extend / implement is allowed
* David McKnight (IBM) - [244277] [dstore] NPE on file save from old client
*******************************************************************************/ *******************************************************************************/
package org.eclipse.rse.dstore.universal.miners; package org.eclipse.rse.dstore.universal.miners;
@ -51,6 +52,7 @@ import java.util.StringTokenizer;
import org.eclipse.dstore.core.miners.Miner; import org.eclipse.dstore.core.miners.Miner;
import org.eclipse.dstore.core.model.DE; import org.eclipse.dstore.core.model.DE;
import org.eclipse.dstore.core.model.DataElement; import org.eclipse.dstore.core.model.DataElement;
import org.eclipse.dstore.core.model.DataStore;
import org.eclipse.dstore.core.model.DataStoreResources; import org.eclipse.dstore.core.model.DataStoreResources;
import org.eclipse.rse.internal.dstore.universal.miners.filesystem.ArchiveQueryThread; import org.eclipse.rse.internal.dstore.universal.miners.filesystem.ArchiveQueryThread;
import org.eclipse.rse.internal.dstore.universal.miners.filesystem.ClassFileParser; import org.eclipse.rse.internal.dstore.universal.miners.filesystem.ClassFileParser;
@ -1270,11 +1272,45 @@ public class UniversalFileSystemMiner extends Miner {
UniversalByteStreamHandler universalHandler = new UniversalByteStreamHandler(_dataStore, deUFSuploadlog); UniversalByteStreamHandler universalHandler = new UniversalByteStreamHandler(_dataStore, deUFSuploadlog);
//_dataStore.setByteStreamHandler(new UniversalByteStreamHandler(_dataStore, deUFSuploadlog));
_dataStore.registerByteStreamHandler(universalHandler); _dataStore.registerByteStreamHandler(universalHandler);
_dataStore.refresh(_minerData); _dataStore.refresh(_minerData);
_dataStore.refresh(deUFSuploadlog); _dataStore.refresh(deUFSuploadlog);
// for bug 244277
// need backward compatibility with RSE 7.1.*
// 1) create a miner element
DataElement minerRoot = _dataStore.getMinerRoot();
String oldName = "com.ibm.etools.systems.universal.miners.UniversalFileSystemMiner"; //$NON-NLS-1$
DataElement oldMinerElement = _dataStore.createObject(minerRoot, DataStoreResources.model_miner, oldName, oldName);
oldMinerElement.setAttribute(DE.A_VALUE, "UniveralFileSystemMiner"); //$NON-NLS-1$
oldMinerElement.setAttribute(DE.A_SOURCE, "7.1.0"); //$NON-NLS-1$
DataElement oldMinerData = _dataStore.createObject(oldMinerElement, DataStoreResources.model_data, DataStoreResources.model_Data, oldName);
// 2) create a miner data
DataElement oldDeUFSnode = _dataStore.createObject(oldMinerData, IUniversalDataStoreConstants.UNIVERSAL_NODE_DESCRIPTOR, "universal.node"); //$NON-NLS-1$
DataElement oldDeUFSuploadlog = _dataStore.createObject(oldDeUFSnode, IUniversalDataStoreConstants.UNIVERSAL_NODE_DESCRIPTOR, "universal.uploadlog"); //$NON-NLS-1$
class OldUniversalByteStreamHandler extends UniversalByteStreamHandler
{
public OldUniversalByteStreamHandler(DataStore dataStore, DataElement log){
super(dataStore, log);
}
public String getId(){
return "com.ibm.etools.systems.universal.miners.UniversalByteStreamHandler"; //$NON-NLS-1$
}
}
OldUniversalByteStreamHandler olduniversalHandler = new OldUniversalByteStreamHandler(_dataStore, oldDeUFSuploadlog);
_dataStore.registerByteStreamHandler(olduniversalHandler);
_dataStore.refresh(minerRoot);
_dataStore.refresh(oldMinerData);
} }
public void finish() { public void finish() {