From dbbcf58643d09fc22f6a56c6b6ded55be99afca9 Mon Sep 17 00:00:00 2001 From: David McKnight Date: Wed, 9 Apr 2008 14:08:29 +0000 Subject: [PATCH] [226237] [dstore] Move the place where the ServerLogger instance is made --- .../dstore/core/server/ConnectionEstablisher.java | 10 ++++++++++ .../dstore/universal/miners/EnvironmentMiner.java | 14 +------------- 2 files changed, 11 insertions(+), 13 deletions(-) diff --git a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/server/ConnectionEstablisher.java b/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/server/ConnectionEstablisher.java index eb21fe0389e..6ad74676743 100644 --- a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/server/ConnectionEstablisher.java +++ b/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/server/ConnectionEstablisher.java @@ -19,6 +19,7 @@ * Jacob Garcowski (IBM) [225175] [dstore] error handling change for Client * David McKnight (IBM) - [225507][api][breaking] RSE dstore API leaks non-API types * Noriaki Takatsu (IBM) - [226074] process for getStatus() API + * Noriaki Takatsu (IBM) - [226237] [dstore] Move the place where the ServerLogger instance is made *******************************************************************************/ package org.eclipse.dstore.core.server; @@ -43,6 +44,7 @@ import org.eclipse.dstore.core.model.DataElement; import org.eclipse.dstore.core.model.DataStore; import org.eclipse.dstore.core.model.DataStoreAttributes; import org.eclipse.dstore.core.model.ISSLProperties; +import org.eclipse.dstore.core.model.Client; import org.eclipse.dstore.internal.core.server.ServerAttributes; import org.eclipse.dstore.internal.core.server.ServerCommandHandler; import org.eclipse.dstore.internal.core.server.ServerReturnCodes; @@ -390,6 +392,14 @@ public class ConnectionEstablisher _updateHandler.setDataStore(_dataStore); _commandHandler.setDataStore(_dataStore); + + if (SystemServiceManager.getInstance().getSystemService() == null) + { + Client client = new Client(); + _dataStore.setClient(client); + ServerLogger logger = new ServerLogger(_dataStore.getUserPreferencesDirectory()); + client.setLogger(logger); + } _receivers = new ArrayList(); _continue = true; diff --git a/rse/plugins/org.eclipse.rse.services.dstore/miners/org/eclipse/rse/dstore/universal/miners/EnvironmentMiner.java b/rse/plugins/org.eclipse.rse.services.dstore/miners/org/eclipse/rse/dstore/universal/miners/EnvironmentMiner.java index 4b87199a19b..80c3f6b1778 100644 --- a/rse/plugins/org.eclipse.rse.services.dstore/miners/org/eclipse/rse/dstore/universal/miners/EnvironmentMiner.java +++ b/rse/plugins/org.eclipse.rse.services.dstore/miners/org/eclipse/rse/dstore/universal/miners/EnvironmentMiner.java @@ -16,6 +16,7 @@ * David McKnight (IBM) - [196624] dstore miner IDs should be String constants rather than dynamic lookup * Noriaki Takatsu (IBM) - [220126] [dstore][api][breaking] Single process server for multiple clients * David McKnight (IBM) [224906] [dstore] changes for getting properties and doing exit due to single-process capability + * Noriaki Takatsu (IBM) - [226237] [dstore] Move the place where the ServerLogger instance is made *******************************************************************************/ package org.eclipse.rse.dstore.universal.miners; @@ -60,19 +61,6 @@ public class EnvironmentMiner extends Miner public void extendSchema(DataElement schemaRoot) { - if (_dataStore.getClient() != null) - { - ServerLogger logger = new ServerLogger(UniversalServerUtilities.getUserPreferencesDirectory(_dataStore)); - _dataStore.getClient().setLogger(logger); - } - else - { - Client client = new Client(); - _dataStore.setClient(client); - ServerLogger logger = new ServerLogger(UniversalServerUtilities.getUserPreferencesDirectory(_dataStore)); - client.setLogger(logger); - } - DataElement envVar = _dataStore.createObjectDescriptor(schemaRoot, "Environment Variable"); //$NON-NLS-1$ _dataStore.createReference(envVar, _dataStore.createRelationDescriptor(schemaRoot,"Parent Environment")); //$NON-NLS-1$ DataElement containerObjectD = _dataStore.findObjectDescriptor("Container Object"); //$NON-NLS-1$