mirror of
https://github.com/eclipse-cdt/cdt
synced 2025-08-23 08:13:50 +02:00
[180994] ensure that we don't do redundant activations and that environment miner variables are cleaned up at the end
This commit is contained in:
parent
5003230df0
commit
1d9c8e7d4b
3 changed files with 10 additions and 5 deletions
|
@ -279,6 +279,8 @@ public class DStoreProcessService extends AbstractProcessService implements IPro
|
||||||
{
|
{
|
||||||
_minerElement = null;
|
_minerElement = null;
|
||||||
_procMinerStatus = null;
|
_procMinerStatus = null;
|
||||||
|
_minerElement = null;
|
||||||
|
_statusMonitor = null;
|
||||||
}
|
}
|
||||||
|
|
||||||
public boolean isInitialized()
|
public boolean isInitialized()
|
||||||
|
@ -308,6 +310,8 @@ public class DStoreProcessService extends AbstractProcessService implements IPro
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
protected void initMiner(IProgressMonitor monitor)
|
protected void initMiner(IProgressMonitor monitor)
|
||||||
{
|
{
|
||||||
DataElement fsElement = getMinerElement();
|
DataElement fsElement = getMinerElement();
|
||||||
|
@ -321,7 +325,7 @@ public class DStoreProcessService extends AbstractProcessService implements IPro
|
||||||
DataStore ds = getDataStore();
|
DataStore ds = getDataStore();
|
||||||
if (_minerElement == null || _minerElement.getDataStore() != ds)
|
if (_minerElement == null || _minerElement.getDataStore() != ds)
|
||||||
{
|
{
|
||||||
if (ds != null)
|
if (ds != null && _procMinerStatus == null)
|
||||||
{
|
{
|
||||||
_procMinerStatus = ds.activateMiner(minerId);
|
_procMinerStatus = ds.activateMiner(minerId);
|
||||||
|
|
||||||
|
|
|
@ -162,7 +162,8 @@ public class DStoreShellService extends AbstractDStoreService implements IShellS
|
||||||
public void uninitService(IProgressMonitor monitor)
|
public void uninitService(IProgressMonitor monitor)
|
||||||
{
|
{
|
||||||
super.uninitService(monitor);
|
super.uninitService(monitor);
|
||||||
|
_envMinerElement = null;
|
||||||
|
_envMinerStatus = null;
|
||||||
}
|
}
|
||||||
|
|
||||||
protected void initMiner(IProgressMonitor monitor)
|
protected void initMiner(IProgressMonitor monitor)
|
||||||
|
@ -177,7 +178,7 @@ public class DStoreShellService extends AbstractDStoreService implements IShellS
|
||||||
DataStore ds = getDataStore();
|
DataStore ds = getDataStore();
|
||||||
if (_envMinerElement == null || _envMinerElement.getDataStore() != ds)
|
if (_envMinerElement == null || _envMinerElement.getDataStore() != ds)
|
||||||
{
|
{
|
||||||
if (ds != null)
|
if (ds != null && _envMinerStatus == null)
|
||||||
{
|
{
|
||||||
_envMinerStatus = ds.activateMiner(minerId);
|
_envMinerStatus = ds.activateMiner(minerId);
|
||||||
/*
|
/*
|
||||||
|
|
|
@ -285,7 +285,7 @@ public abstract class AbstractDStoreService implements IDStoreService
|
||||||
DataStore ds = getDataStore();
|
DataStore ds = getDataStore();
|
||||||
if (_minerElement == null || _minerElement.getDataStore() != ds)
|
if (_minerElement == null || _minerElement.getDataStore() != ds)
|
||||||
{
|
{
|
||||||
if (ds != null)
|
if (ds != null && _initializeStatus == null)
|
||||||
{
|
{
|
||||||
_initializeStatus = ds.activateMiner(minerId);
|
_initializeStatus = ds.activateMiner(minerId);
|
||||||
/*
|
/*
|
||||||
|
|
Loading…
Add table
Reference in a new issue