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

[dstore] in single-process multi-client mode tracing shouldn't start until the client is set

Browse source
This commit is contained in:
David McKnight 2008-05-13 13:26:37 +00:00
parent 38a8e98b19
commit cd4cc996d2
1 changed files with 32 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -23,6 +23,7 @@
* David McKnight (IBM) - [227881] [dstore][threaded] There is no chance to set client object for getUserPreferencesDirectory() * David McKnight (IBM) - [227881] [dstore][threaded] There is no chance to set client object for getUserPreferencesDirectory()
* Norikai Takatsu (IBM) - [228156] [dstore] DataElementRemover thread doesn't terminate after a client disconnects the server * Norikai Takatsu (IBM) - [228156] [dstore] DataElementRemover thread doesn't terminate after a client disconnects the server
* 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) - [231639] [dstore] in single-process multi-client mode tracing shouldn't start until the client is set
*******************************************************************************/ *******************************************************************************/
package org.eclipse.dstore.core.model; package org.eclipse.dstore.core.model;
@ -53,6 +54,7 @@ import org.eclipse.dstore.core.java.ClassByteStreamHandlerRegistry;
import org.eclipse.dstore.core.java.IClassByteStreamHandler; import org.eclipse.dstore.core.java.IClassByteStreamHandler;
import org.eclipse.dstore.core.java.IRemoteClassInstance; import org.eclipse.dstore.core.java.IRemoteClassInstance;
import org.eclipse.dstore.core.java.RemoteClassLoader; import org.eclipse.dstore.core.java.RemoteClassLoader;
import org.eclipse.dstore.core.server.SystemServiceManager;
import org.eclipse.dstore.core.util.StringCompare; import org.eclipse.dstore.core.util.StringCompare;
import org.eclipse.dstore.extra.IDomainNotifier; import org.eclipse.dstore.extra.IDomainNotifier;
import org.eclipse.dstore.internal.core.client.ClientCommandHandler; import org.eclipse.dstore.internal.core.client.ClientCommandHandler;
@ -3606,6 +3608,8 @@ public final class DataStore
} }
if (_tracingOn) if (_tracingOn)
{ {
// only start tracing now if we're in one process per server mode
if (SystemServiceManager.getInstance().getSystemService() == null){
String logDir = getUserPreferencesDirectory(); String logDir = getUserPreferencesDirectory();
_traceFileHandle = new File(logDir, ".dstoreTrace"); //$NON-NLS-1$ _traceFileHandle = new File(logDir, ".dstoreTrace"); //$NON-NLS-1$
@ -3618,6 +3622,7 @@ public final class DataStore
{ {
} }
} }
}
//_remoteClassLoader = new RemoteClassLoader(this); //_remoteClassLoader = new RemoteClassLoader(this);
_classReqRepository = new HashMap(); _classReqRepository = new HashMap();
@ -4418,7 +4423,23 @@ public final class DataStore
if (_client == null){ if (_client == null){
_client = client; _client = client;
_userPreferencesDirectory = null; _userPreferencesDirectory = null;
getUserPreferencesDirectory(); String logDir = getUserPreferencesDirectory();
// single process server?
if (SystemServiceManager.getInstance().getSystemService() != null)
{
if (_tracingOn) {
_traceFileHandle = new File(logDir, ".dstoreTrace"); //$NON-NLS-1$
try
{
_traceFile = new RandomAccessFile(_traceFileHandle, "rw"); //$NON-NLS-1$
startTracing();
}
catch (IOException e)
{
}
}
}
} }
} }