Changeset 16940 for trunk/HeuristicLab.ExtLibs/HeuristicLab.OrTools

Timestamp:

05/10/19 14:36:48 (6 years ago)

Author:

ddorfmei

Message:

#2931:

• Added StorableType attribute to interfaces and classes where it was missing
• Moved code from HeuristicLabOrToolsPlugin.OnUnload() to finalizer because native DLL was unloaded to early

File:

• trunk/HeuristicLab.ExtLibs/HeuristicLab.OrTools/7.0.0/HeuristicLab.OrTools-7.0.0/Plugin.cs.frame (modified) (1 diff)

trunk/HeuristicLab.ExtLibs/HeuristicLab.OrTools/7.0.0/HeuristicLab.OrTools-7.0.0/Plugin.cs.frame

@@ -38 +38 @@
   public class HeuristicLabOrToolsPlugin : PluginBase {
 
-    public override void OnUnload() {
-      // HACK: free handle to native DLL used temporarily by the Hive Slave
-      // should be solved for all native DLLs used by the Hive Slave
+    ~HeuristicLabOrToolsPlugin() {
+      // HACK: Free handle to native DLL used temporarily by the Hive Slave.
+      // Finalizer must be used because generated finalizers used in
+      // HeuristicLab.ExactOptimization that call destructors in native DLL
+      // are called after HeuristicLabOrToolsPlugin.OnUnload().
+      // This should be solved for all native DLLs used by the Hive Slave.
       var dllDir = new FileInfo(GetType().Assembly.Location).Directory;
       if (dllDir == null || !dllDir.FullName.Contains(Path.DirectorySeparatorChar + "PluginTemp" + Path.DirectorySeparatorChar))