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

[432875] [dstore] do not use rmt_classloader_cache*.jar

Browse source
This commit is contained in:
Dave McKnight 2014-04-16 10:10:15 -04:00
parent 8c1c3b5642
commit dede0b3299
1 changed files with 23 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/model/DataStore.java
View file

@ -1,5 +1,5 @@
/******************************************************************************* /*******************************************************************************
* Copyright (c) 2002, 2012 IBM Corporation and others. * Copyright (c) 2002, 2014 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials * All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0 * are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at * which accompanies this distribution, and is available at
@ -46,6 +46,7 @@
* David McKnight (IBM) - [385793] [dstore] DataStore spirit mechanism and other memory improvements needed * David McKnight (IBM) - [385793] [dstore] DataStore spirit mechanism and other memory improvements needed
* David McKnight (IBM) - [390037] [dstore] Duplicated items in the System view * David McKnight (IBM) - [390037] [dstore] Duplicated items in the System view
* David McKnight (IBM) - [396440] [dstore] fix issues with the spiriting mechanism and other memory improvements (phase 1) * David McKnight (IBM) - [396440] [dstore] fix issues with the spiriting mechanism and other memory improvements (phase 1)
* David McKnight (IBM) - [432875] [dstore] do not use rmt_classloader_cache*.jar
*******************************************************************************/ *******************************************************************************/
package org.eclipse.dstore.core.model; package org.eclipse.dstore.core.model;
@ -2650,11 +2651,16 @@ public final class DataStore
_ticket = null; _ticket = null;
// clear the maps // clear the maps
_classReqRepository.clear(); if (_classReqRepository != null){
_classReqRepository.clear();
}
_cmdDescriptorMap.clear(); _cmdDescriptorMap.clear();
_hashMap.clear(); _hashMap.clear();
_lastCreatedElements.clear(); _lastCreatedElements.clear();
_localClassLoaders.clear();
if (_localClassLoaders != null){
_localClassLoaders.clear();
}
_objDescriptorMap.clear(); _objDescriptorMap.clear();
_relDescriptorMap.clear(); _relDescriptorMap.clear();
@ -3732,22 +3738,26 @@ public final class DataStore
} }
} }
//_remoteClassLoader = new RemoteClassLoader(this);
_classReqRepository = new HashMap();
_waitingStatuses = new ArrayList(); _waitingStatuses = new ArrayList();
_byteStreamHandlerRegistry = new ByteStreamHandlerRegistry(); _byteStreamHandlerRegistry = new ByteStreamHandlerRegistry();
_classbyteStreamHandlerRegistry = new ClassByteStreamHandlerRegistry();
setDefaultByteStreamHandler(); setDefaultByteStreamHandler();
setDefaultClassByteStreamHandler();
// only start tracing now if we're in one process per server mode // remote class loading
if (SystemServiceManager.getInstance().getSystemService() == null){ // only supported when -DDSTORE_REMOTE_CLASS_LOADING_ON=true
assignCacheJar(); //
String remoteClassLoading = System.getProperty("DSTORE_REMOTE_CLASS_LOADING_ON"); //$NON-NLS-1$
if (remoteClassLoading != null && remoteClassLoading.equals("true")){ //$NON-NLS-1$
_classReqRepository = new HashMap();
_classbyteStreamHandlerRegistry = new ClassByteStreamHandlerRegistry();
setDefaultClassByteStreamHandler();
// only allow remote class loading if this is 1 client per server
if (SystemServiceManager.getInstance().getSystemService() == null){
assignCacheJar();
}
registerLocalClassLoader(this.getClass().getClassLoader());
} }
registerLocalClassLoader(this.getClass().getClassLoader());
} }
public void startDataElementRemoverThread() public void startDataElementRemoverThread()