don't force library unloading when on-demand-unloading is enabled

rhaschke · rhaschke · commit 051cfd53fcf3 · 2016-04-03T09:40:31.000+02:00
diff --git a/src/multi_library_class_loader.cpp b/src/multi_library_class_loader.cpp
@@ -80,6 +80,7 @@ void MultiLibraryClassLoader::loadLibrary(const std::string& library_path)
 
 void MultiLibraryClassLoader::shutdownAllClassLoaders()
 {
+  if (isOnDemandLoadUnloadEnabled()) return;
   std::vector<std::string> available_libraries = getRegisteredLibraries();
   for(unsigned int c = 0; c < available_libraries.size(); c++)
     unloadLibrary(available_libraries.at(c));

Original file line number	Diff line number	Diff line change
`@@ -80,6 +80,7 @@ void MultiLibraryClassLoader::loadLibrary(const std::string& library_path)`
`80`	`80`
`81`	`81`	`void MultiLibraryClassLoader::shutdownAllClassLoaders()`
`82`	`82`	`{`
	`83`	`+ if (isOnDemandLoadUnloadEnabled()) return;`
`83`	`84`	`std::vector<std::string> available_libraries = getRegisteredLibraries();`
`84`	`85`	`for(unsigned int c = 0; c < available_libraries.size(); c++)`
`85`	`86`	`unloadLibrary(available_libraries.at(c));`