Skip to content
Snippets Groups Projects
Commit ad744ba0 authored by Jan David Mol's avatar Jan David Mol
Browse files

bug 1362: destroy GCFScheduler::instance on program termination

parent 62e5339b
No related branches found
No related tags found
No related merge requests found
...@@ -224,8 +224,6 @@ private: ...@@ -224,8 +224,6 @@ private:
// Dummy port to be passed in event we make. // Dummy port to be passed in event we make.
GCFDummyPort* itsFrameworkPort; GCFDummyPort* itsFrameworkPort;
static GCFScheduler* theirGCFScheduler;
}; };
} // namespace TM } // namespace TM
......
...@@ -43,7 +43,6 @@ namespace LOFAR { ...@@ -43,7 +43,6 @@ namespace LOFAR {
// static member initialisation // static member initialisation
GCFScheduler* GCFScheduler::theirGCFScheduler = 0;
int GCFScheduler::_argc = 0; int GCFScheduler::_argc = 0;
char** GCFScheduler::_argv = 0; char** GCFScheduler::_argv = 0;
...@@ -56,10 +55,9 @@ static const uint BATCH_SIZE = 3; // number of message handled before control i ...@@ -56,10 +55,9 @@ static const uint BATCH_SIZE = 3; // number of message handled before control i
// //
GCFScheduler* GCFScheduler::instance() GCFScheduler* GCFScheduler::instance()
{ {
if (theirGCFScheduler == 0) { static GCFScheduler scheduler;
theirGCFScheduler = new GCFScheduler();
} return &scheduler;
return (theirGCFScheduler);
} }
// //
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment