summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWilliam R. Otte <wotte@dre.vanderbilt.edu>2010-06-29 14:49:40 +0000
committerWilliam R. Otte <wotte@dre.vanderbilt.edu>2010-06-29 14:49:40 +0000
commitb5c6b487c8699d664e13b3911e1fa85ae46ac2bd (patch)
tree333db0e77116ef6e8212917038b78e94f472a388
parent874421cfac17e4ab55f7fb9c4c754e061a465911 (diff)
downloadATCD-b5c6b487c8699d664e13b3911e1fa85ae46ac2bd.tar.gz
Tue Jun 29 14:49:04 UTC 2010 William R. Otte <wotte@dre.vanderbilt.edu>
* DAnCE/NodeApplication/NodeApplication_Impl.cpp: * DAnCE/NodeManager/NodeManager_Impl.cpp: Moved the plugin manager cleanup to the node manager.
-rw-r--r--CIAO/DAnCE/NodeApplication/NodeApplication_Impl.cpp1
-rw-r--r--CIAO/DAnCE/NodeManager/NodeManager_Impl.cpp2
2 files changed, 2 insertions, 1 deletions
diff --git a/CIAO/DAnCE/NodeApplication/NodeApplication_Impl.cpp b/CIAO/DAnCE/NodeApplication/NodeApplication_Impl.cpp
index f8fe4150b82..d78fd1b2871 100644
--- a/CIAO/DAnCE/NodeApplication/NodeApplication_Impl.cpp
+++ b/CIAO/DAnCE/NodeApplication/NodeApplication_Impl.cpp
@@ -62,7 +62,6 @@ NodeApplication_Impl::~NodeApplication_Impl()
{
DANCE_TRACE( "NodeApplication_Impl::~NodeApplication_Impl()");
this->scheduler_.terminate_scheduler ();
- PLUGIN_MANAGER::close ();
}
void
diff --git a/CIAO/DAnCE/NodeManager/NodeManager_Impl.cpp b/CIAO/DAnCE/NodeManager/NodeManager_Impl.cpp
index 4857c4b2a0f..df208f2ff44 100644
--- a/CIAO/DAnCE/NodeManager/NodeManager_Impl.cpp
+++ b/CIAO/DAnCE/NodeManager/NodeManager_Impl.cpp
@@ -84,6 +84,8 @@ namespace DAnCE
ACE_TEXT("NodeApplicationManager %C\n"), (*iter).ext_id_.c_str ()));
}
}
+
+ PLUGIN_MANAGER::close ();
}
void