Changeset 5707 for branches/HeuristicLab.Hive-3.3/sources/HeuristicLab.Hive/HeuristicLab.Hive.Contracts/3.3/WcfServicePool.cs

Timestamp:

03/16/11 13:31:37 (13 years ago)

Author:

cneumuel

Message:

#1260

• some changes due to the removal of Disposable (r5706)
• copy PluginInfrastructure files into PluginCache folder in slaves (needed due to r5703)

File:

• branches/HeuristicLab.Hive-3.3/sources/HeuristicLab.Hive/HeuristicLab.Hive.Contracts/3.3/WcfServicePool.cs (modified) (2 diffs)

branches/HeuristicLab.Hive-3.3/sources/HeuristicLab.Hive/HeuristicLab.Hive.Contracts/3.3/WcfServicePool.cs

@@ -58 +58 @@
     }
 
-    public Disposable<T> GetService() {
+    public DisposableWrapper<T> GetService() {
       try {
         if (!string.IsNullOrEmpty(userName) && !string.IsNullOrEmpty(password)) {
           var factory = ClientFactory.CreateChannelFactory<T>(endpointName, hostAddress, userName, password);
-          return new Disposable<T>(factory.Obj.CreateChannel());
+          var disposable = new DisposableWrapper<T>(factory.CreateChannel());
+          disposable.OnDisposing += new EventHandler<EventArgs<object>>(disposable_OnDisposing);
+          return disposable;
         } else {
           var factory = ClientFactory.CreateChannelFactory<T>(endpointName, hostAddress);
-          return new Disposable<T>(factory.Obj.CreateChannel());     
+          var disposable = new DisposableWrapper<T>(factory.CreateChannel());
+          disposable.OnDisposing += new EventHandler<EventArgs<object>>(disposable_OnDisposing);
+          return disposable; 
         }
       }
@@ -81 +85 @@
       }
     }
+
+    private void disposable_OnDisposing(object sender, EventArgs<object> e) {
+      DisposeCommunicationObject((ICommunicationObject)e.Value);
+    }
+
+    public static void DisposeCommunicationObject(ICommunicationObject obj) {
+      if (obj != null) {
+        if (obj.State != CommunicationState.Faulted && obj.State != CommunicationState.Closed) {
+          try { obj.Close(); }
+          catch { obj.Abort(); }
+        } else {
+          obj.Abort();
+        }
+      }
+    }
   }
 }