Changeset 840

Timestamp:

11/27/08 15:58:48 (15 years ago)

Author:

kgrading

Message:

implemented changes from (#398) and changed the server IP

Location:

trunk/sources

Files:

• HeuristicLab.Hive.Client.Communication/ServerProxy.cs (modified) (7 diffs)
• HeuristicLab.Hive.Client.Communication/ServiceLocator.cs (modified) (1 diff)
• HeuristicLab.Hive.Client.Core/Core.cs (modified) (2 diffs)

trunk/sources/HeuristicLab.Hive.Client.Communication/ServerProxy.cs

@@ -34 +34 @@
 
     [System.ServiceModel.OperationContractAttribute(Action = "http://tempuri.org/IClientCommunicator/SendJobResult", ReplyAction = "http://tempuri.org/IClientCommunicator/SendJobResultResponse")]
-    HeuristicLab.Hive.Contracts.Response SendJobResult(HeuristicLab.Hive.Contracts.BusinessObjects.JobResult Result, bool finished);
+    HeuristicLab.Hive.Contracts.ResponseResultReceived SendJobResult(HeuristicLab.Hive.Contracts.BusinessObjects.JobResult Result, bool finished);
 
     [System.ServiceModel.OperationContractAttribute(AsyncPattern = true, Action = "http://tempuri.org/IClientCommunicator/SendJobResult", ReplyAction = "http://tempuri.org/IClientCommunicator/SendJobResultResponse")]
     System.IAsyncResult BeginSendJobResult(HeuristicLab.Hive.Contracts.BusinessObjects.JobResult Result, bool finished, System.AsyncCallback callback, object asyncState);
 
-    HeuristicLab.Hive.Contracts.Response EndSendJobResult(System.IAsyncResult result);
+    HeuristicLab.Hive.Contracts.ResponseResultReceived EndSendJobResult(System.IAsyncResult result);
 
     [System.ServiceModel.OperationContractAttribute(Action = "http://tempuri.org/IClientCommunicator/Logout", ReplyAction = "http://tempuri.org/IClientCommunicator/LogoutResponse")]
@@ -122 +122 @@
     }
 
+    public HeuristicLab.Hive.Contracts.ResponseResultReceived Result {
+      get {
+        base.RaiseExceptionIfNecessary();
+        return ((HeuristicLab.Hive.Contracts.ResponseResultReceived)(this.results[0]));
+      }
+    }
+  }
+
+  [System.Diagnostics.DebuggerStepThroughAttribute()]
+  [System.CodeDom.Compiler.GeneratedCodeAttribute("System.ServiceModel", "3.0.0.0")]
+  public partial class LogoutCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+
+    private object[] results;
+
+    public LogoutCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) :
+      base(exception, cancelled, userState) {
+      this.results = results;
+    }
+
     public HeuristicLab.Hive.Contracts.Response Result {
       get {
@@ -132 +151 @@
   [System.Diagnostics.DebuggerStepThroughAttribute()]
   [System.CodeDom.Compiler.GeneratedCodeAttribute("System.ServiceModel", "3.0.0.0")]
-  public partial class LogoutCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
-
-    private object[] results;
-
-    public LogoutCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) :
-      base(exception, cancelled, userState) {
-      this.results = results;
-    }
-
-    public HeuristicLab.Hive.Contracts.Response Result {
-      get {
-        base.RaiseExceptionIfNecessary();
-        return ((HeuristicLab.Hive.Contracts.Response)(this.results[0]));
-      }
-    }
-  }
-
-  [System.Diagnostics.DebuggerStepThroughAttribute()]
-  [System.CodeDom.Compiler.GeneratedCodeAttribute("System.ServiceModel", "3.0.0.0")]
   public partial class ClientCommunicatorClient : System.ServiceModel.ClientBase<IClientCommunicator>, IClientCommunicator {
 
@@ -362 +362 @@
     }
 
-    public HeuristicLab.Hive.Contracts.Response SendJobResult(HeuristicLab.Hive.Contracts.BusinessObjects.JobResult Result, bool finished) {
+    public HeuristicLab.Hive.Contracts.ResponseResultReceived SendJobResult(HeuristicLab.Hive.Contracts.BusinessObjects.JobResult Result, bool finished) {
       return base.Channel.SendJobResult(Result, finished);
     }
@@ -372 +372 @@
 
     [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)]
-    public HeuristicLab.Hive.Contracts.Response EndSendJobResult(System.IAsyncResult result) {
+    public HeuristicLab.Hive.Contracts.ResponseResultReceived EndSendJobResult(System.IAsyncResult result) {
       return base.Channel.EndSendJobResult(result);
     }
@@ -383 +383 @@
 
     private object[] OnEndSendJobResult(System.IAsyncResult result) {
-      HeuristicLab.Hive.Contracts.Response retVal = this.EndSendJobResult(result);
+      HeuristicLab.Hive.Contracts.ResponseResultReceived retVal = this.EndSendJobResult(result);
       return new object[] {
                 retVal};
@@ -465 +465 @@
   }
 }
-

trunk/sources/HeuristicLab.Hive.Client.Communication/ServiceLocator.cs

@@ -13 +13 @@
         proxy = new ClientCommunicatorClient(
           new NetTcpBinding(),
-          new EndpointAddress("net.tcp://10.20.53.1:9000/HiveServer/ClientCommunicator")
+          new EndpointAddress("net.tcp://10.20.53.3:9000/HiveServer/ClientCommunicator")
           );
       }

trunk/sources/HeuristicLab.Hive.Client.Core/Core.cs

@@ -146 +146 @@
       JobResult jobResult = new JobResult { JobId = jId, Result = sJob, Client = null };
       clientCommunicator.SendJobResultAsync(jobResult, true);
-
-      AppDomain.Unload(appDomains[jId]);
-      appDomains.Remove(jId);
-      engines.Remove(jId);
-      Status.CurrentJobs--;
-      Debug.WriteLine("Decrement CurrentJobs to:" + Status.CurrentJobs.ToString());        
-
     }
 
@@ -182 +175 @@
     }
 
-    void ClientCommunicator_SendJobResultCompleted(object sender, SendJobResultCompletedEventArgs e) {      
-      // TODO Removing of the Engines & AppDomains should happen here, not in the GetFinishedJob Method.
+    void ClientCommunicator_SendJobResultCompleted(object sender, SendJobResultCompletedEventArgs e) {
+      if (e.Result.Success) {
+        AppDomain.Unload(appDomains[e.Result.JobId]);
+        appDomains.Remove(e.Result.JobId);
+        engines.Remove(e.Result.JobId);
+        Status.CurrentJobs--;
+        Debug.WriteLine("Decrement CurrentJobs to:" + Status.CurrentJobs.ToString());
+      } else {
+        Debug.WriteLine("Job sending FAILED!");
+      }
     }
   }