Changeset 4342 for branches/3.3-Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Slave.Communication/3.3

Timestamp:

08/30/10 13:47:43 (14 years ago)

Author:

cneumuel

Message:

added connection setup dialog

Location:

branches/3.3-Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Slave.Communication/3.3

Files:

• Service References/SlaveService/Reference.svcmap (modified) (1 diff)
• Service References/SlaveService/SlaveFacade.wsdl (modified) (1 diff)
• Service References/SlaveService/configuration.svcinfo (modified) (1 diff)
• Service References/SlaveService/configuration91.svcinfo (modified) (2 diffs)
• SlaveServicePool.cs (modified) (3 diffs)
• app.config (modified) (2 diffs)

branches/3.3-Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Slave.Communication/3.3/Service References/SlaveService/Reference.svcmap

@@ -33 +33 @@
     <MetadataFile FileName="SlaveService7.xsd" MetadataType="Schema" ID="25348808-3181-4343-bba3-796e0172b1fd" SourceId="1" SourceUrl="http://localhost:9000/SlaveService?xsd=xsd0" />
     <MetadataFile FileName="SlaveService8.xsd" MetadataType="Schema" ID="4c7dfc61-c84a-4378-b121-38f8f8f2a86a" SourceId="1" SourceUrl="http://localhost:9000/SlaveService?xsd=xsd3" />
-    <MetadataFile FileName="SlaveService.wsdl" MetadataType="Wsdl" ID="ef494f6e-9864-4628-b3e8-58f471d5d1bd" SourceId="1" SourceUrl="http://localhost:9000/SlaveService?wsdl=wsdl0" />
+    <MetadataFile FileName="SlaveService.wsdl" MetadataType="Wsdl" ID="23cc9a85-d45a-4906-bd6e-fdedba89cc5e" SourceId="1" SourceUrl="http://localhost:9000/SlaveService?wsdl=wsdl0" />
     <MetadataFile FileName="SlaveService9.xsd" MetadataType="Schema" ID="c6237b7a-a9fd-42d5-bcc3-bb872bb61485" SourceId="1" SourceUrl="http://localhost:9000/SlaveService?xsd=xsd2" />
   </Metadata>

branches/3.3-Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Slave.Communication/3.3/Service References/SlaveService/SlaveFacade.wsdl

@@ -1194 +1194 @@
           <KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#">
             <X509Data>
-              <X509Certificate>MIIB7jCCAVugAwIBAgIQ3s9wqCSCIrRGeccFaiyZ+jAJBgUrDgMCHQUAMBQxEjAQBgNVBAMTCWxvY2FsaG9zdDAeFw0xMDA4MjMxNTU4NDhaFw0zOTEyMzEyMzU5NTlaMBQxEjAQBgNVBAMTCWxvY2FsaG9zdDCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEApjoMHgel+ErOltsW9oYNcetXIw9k+0jtHJJM5rakYQtlFpcvXQZ6JxSZoPUYzdMupdrWYVczYavA4ApJ94T4ORi91yMGF+D7F8DZnk+ovu7OqxmxErmhDL2DgECUifjE4Ab1wsKNoOZxRyAaj+FuGlNnsm8T+x+HJta0KaGBx40CAwEAAaNJMEcwRQYDVR0BBD4wPIAQEg4TvyBOxX+z6ZAlRfKFKaEWMBQxEjAQBgNVBAMTCWxvY2FsaG9zdIIQ3s9wqCSCIrRGeccFaiyZ+jAJBgUrDgMCHQUAA4GBAIcQM5tyU1e4+dY7YuT+4s0xLO/vOd+JEJaHgCQ8JSqJZHeGTJH9AYnsQtlbdSrJ8VI6ytB22yE82s5L5AJiou3T/uBvt0q1moOZUuDXKD400Mtek98wvROsmn0Wmadf6cYwtwKeOKsKuCo5dphI3hx7HYnv4eJaKME6gvRZS24K</X509Certificate>
+              <X509Certificate>MIIB7jCCAVugAwIBAgIQb2ZYEwo7H4xBuUFF+8joTjAJBgUrDgMCHQUAMBQxEjAQBgNVBAMTCWxvY2FsaG9zdDAeFw0xMDA4MzAwOTEzMjFaFw0zOTEyMzEyMzU5NTlaMBQxEjAQBgNVBAMTCWxvY2FsaG9zdDCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAm4ya4TrUqXxc+dST73X8TFUiqp1oX8462b7cKVbMvA+fPZt0nkugGpVsLZKTwkdgvmuBiqPXuvPaNPgbbjroMqQFqpFIZM//1y71KeSjzQe4oGO4XuJ4DC6eBrFgVmXZfj/INvbefp3XtU4r+nT88eWIHwfZa72c2kuk0/3jWrECAwEAAaNJMEcwRQYDVR0BBD4wPIAQT07kR9e4PDH6Xk/zg1nV7qEWMBQxEjAQBgNVBAMTCWxvY2FsaG9zdIIQb2ZYEwo7H4xBuUFF+8joTjAJBgUrDgMCHQUAA4GBAFKYCuLFMQKsEfHskSvHJss4YTd9cTfP5yjyKPXBE2jb4yVy/Mzuw3lwssogREwJH54SAoUSAJhPz48bxXQdnzrkGN/zh66G2ovhuyEPEhxfgCnce3CV7dIeDpJ8uA6T40JeFfT9pWWhvH1V5qSoaXmfgoQPGP8Twg808y5XkP5m</X509Certificate>
             </X509Data>
           </KeyInfo>

branches/3.3-Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Slave.Communication/3.3/Service References/SlaveService/configuration.svcinfo

@@ -8 +8 @@
   </bindings>
   <endpoints>
-    <endpoint normalizedDigest="&lt;?xml version=&quot;1.0&quot; encoding=&quot;utf-16&quot;?&gt;&lt;Data address=&quot;http://localhost:9000/SlaveService&quot; binding=&quot;wsHttpBinding&quot; bindingConfiguration=&quot;SlaveHttpEndpoint&quot; contract=&quot;SlaveService.ISlaveFacade&quot; name=&quot;SlaveHttpEndpoint&quot;&gt;&lt;identity&gt;&lt;certificate encodedValue=&quot;AwAAAAEAAAAUAAAAeBLH/0jWrlsW42fIC8VIIdAE6PUgAAAAAQAAAPIBAAAwggHuMIIBW6ADAgECAhDez3CoJIIitEZ5xwVqLJn6MAkGBSsOAwIdBQAwFDESMBAGA1UEAxMJbG9jYWxob3N0MB4XDTEwMDgyMzE1NTg0OFoXDTM5MTIzMTIzNTk1OVowFDESMBAGA1UEAxMJbG9jYWxob3N0MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCmOgweB6X4Ss6W2xb2hg1x61cjD2T7SO0ckkzmtqRhC2UWly9dBnonFJmg9RjN0y6l2tZhVzNhq8DgCkn3hPg5GL3XIwYX4PsXwNmeT6i+7s6rGbESuaEMvYOAQJSJ+MTgBvXCwo2g5nFHIBqP4W4aU2eybxP7H4cm1rQpoYHHjQIDAQABo0kwRzBFBgNVHQEEPjA8gBASDhO/IE7Ff7PpkCVF8oUpoRYwFDESMBAGA1UEAxMJbG9jYWxob3N0ghDez3CoJIIitEZ5xwVqLJn6MAkGBSsOAwIdBQADgYEAhxAzm3JTV7j51jti5P7izTEs7+8534kQloeAJDwlKolkd4ZMkf0BiexC2Vt1KsnxUjrK0HbbITzazkvkAmKi7dP+4G+3SrWag5lS4NcoPjTQy16T3zC9E6yafRaZp1/pxjC3Ap44qwq4Kjl2mEjeHHsdie/h4loowTqC9FlLbgo=&quot; /&gt;&lt;/identity&gt;&lt;/Data&gt;" digest="&lt;?xml version=&quot;1.0&quot; encoding=&quot;utf-16&quot;?&gt;&lt;Data address=&quot;http://localhost:9000/SlaveService&quot; binding=&quot;wsHttpBinding&quot; bindingConfiguration=&quot;SlaveHttpEndpoint&quot; contract=&quot;SlaveService.ISlaveFacade&quot; name=&quot;SlaveHttpEndpoint&quot;&gt;&lt;identity&gt;&lt;certificate encodedValue=&quot;AwAAAAEAAAAUAAAAeBLH/0jWrlsW42fIC8VIIdAE6PUgAAAAAQAAAPIBAAAwggHuMIIBW6ADAgECAhDez3CoJIIitEZ5xwVqLJn6MAkGBSsOAwIdBQAwFDESMBAGA1UEAxMJbG9jYWxob3N0MB4XDTEwMDgyMzE1NTg0OFoXDTM5MTIzMTIzNTk1OVowFDESMBAGA1UEAxMJbG9jYWxob3N0MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCmOgweB6X4Ss6W2xb2hg1x61cjD2T7SO0ckkzmtqRhC2UWly9dBnonFJmg9RjN0y6l2tZhVzNhq8DgCkn3hPg5GL3XIwYX4PsXwNmeT6i+7s6rGbESuaEMvYOAQJSJ+MTgBvXCwo2g5nFHIBqP4W4aU2eybxP7H4cm1rQpoYHHjQIDAQABo0kwRzBFBgNVHQEEPjA8gBASDhO/IE7Ff7PpkCVF8oUpoRYwFDESMBAGA1UEAxMJbG9jYWxob3N0ghDez3CoJIIitEZ5xwVqLJn6MAkGBSsOAwIdBQADgYEAhxAzm3JTV7j51jti5P7izTEs7+8534kQloeAJDwlKolkd4ZMkf0BiexC2Vt1KsnxUjrK0HbbITzazkvkAmKi7dP+4G+3SrWag5lS4NcoPjTQy16T3zC9E6yafRaZp1/pxjC3Ap44qwq4Kjl2mEjeHHsdie/h4loowTqC9FlLbgo=&quot; /&gt;&lt;/identity&gt;&lt;/Data&gt;" contractName="SlaveService.ISlaveFacade" name="SlaveHttpEndpoint" />
+    <endpoint normalizedDigest="&lt;?xml version=&quot;1.0&quot; encoding=&quot;utf-16&quot;?&gt;&lt;Data address=&quot;http://localhost:9000/SlaveService&quot; binding=&quot;wsHttpBinding&quot; bindingConfiguration=&quot;SlaveHttpEndpoint&quot; contract=&quot;SlaveService.ISlaveFacade&quot; name=&quot;SlaveHttpEndpoint&quot;&gt;&lt;identity&gt;&lt;certificate encodedValue=&quot;AwAAAAEAAAAUAAAAJ5p7xBv8o/BZ9Lp1c1d+F13FxN8gAAAAAQAAAPIBAAAwggHuMIIBW6ADAgECAhBvZlgTCjsfjEG5QUX7yOhOMAkGBSsOAwIdBQAwFDESMBAGA1UEAxMJbG9jYWxob3N0MB4XDTEwMDgzMDA5MTMyMVoXDTM5MTIzMTIzNTk1OVowFDESMBAGA1UEAxMJbG9jYWxob3N0MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCbjJrhOtSpfFz51JPvdfxMVSKqnWhfzjrZvtwpVsy8D589m3SeS6AalWwtkpPCR2C+a4GKo9e689o0+BtuOugypAWqkUhkz//XLvUp5KPNB7igY7he4ngMLp4GsWBWZdl+P8g29t5+nde1Tiv6dPzx5YgfB9lrvZzaS6TT/eNasQIDAQABo0kwRzBFBgNVHQEEPjA8gBBPTuRH17g8MfpeT/ODWdXuoRYwFDESMBAGA1UEAxMJbG9jYWxob3N0ghBvZlgTCjsfjEG5QUX7yOhOMAkGBSsOAwIdBQADgYEAUpgK4sUxAqwR8eyRK8cmyzhhN31xN8/nKPIo9cETaNvjJXL8zO7DeXCyyiBETAkfnhIChRIAmE/PjxvFdB2fOuQY3/OHrobai+G7IQ8SHF+AKdx7cJXt0h4Okny4DpPjQl4V9P2lZaG8fVXmpKhpeZ+ChA8Y/xPCDzTzLleQ/mY=&quot; /&gt;&lt;/identity&gt;&lt;/Data&gt;" digest="&lt;?xml version=&quot;1.0&quot; encoding=&quot;utf-16&quot;?&gt;&lt;Data address=&quot;http://localhost:9000/SlaveService&quot; binding=&quot;wsHttpBinding&quot; bindingConfiguration=&quot;SlaveHttpEndpoint&quot; contract=&quot;SlaveService.ISlaveFacade&quot; name=&quot;SlaveHttpEndpoint&quot;&gt;&lt;identity&gt;&lt;certificate encodedValue=&quot;AwAAAAEAAAAUAAAAJ5p7xBv8o/BZ9Lp1c1d+F13FxN8gAAAAAQAAAPIBAAAwggHuMIIBW6ADAgECAhBvZlgTCjsfjEG5QUX7yOhOMAkGBSsOAwIdBQAwFDESMBAGA1UEAxMJbG9jYWxob3N0MB4XDTEwMDgzMDA5MTMyMVoXDTM5MTIzMTIzNTk1OVowFDESMBAGA1UEAxMJbG9jYWxob3N0MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCbjJrhOtSpfFz51JPvdfxMVSKqnWhfzjrZvtwpVsy8D589m3SeS6AalWwtkpPCR2C+a4GKo9e689o0+BtuOugypAWqkUhkz//XLvUp5KPNB7igY7he4ngMLp4GsWBWZdl+P8g29t5+nde1Tiv6dPzx5YgfB9lrvZzaS6TT/eNasQIDAQABo0kwRzBFBgNVHQEEPjA8gBBPTuRH17g8MfpeT/ODWdXuoRYwFDESMBAGA1UEAxMJbG9jYWxob3N0ghBvZlgTCjsfjEG5QUX7yOhOMAkGBSsOAwIdBQADgYEAUpgK4sUxAqwR8eyRK8cmyzhhN31xN8/nKPIo9cETaNvjJXL8zO7DeXCyyiBETAkfnhIChRIAmE/PjxvFdB2fOuQY3/OHrobai+G7IQ8SHF+AKdx7cJXt0h4Okny4DpPjQl4V9P2lZaG8fVXmpKhpeZ+ChA8Y/xPCDzTzLleQ/mY=&quot; /&gt;&lt;/identity&gt;&lt;/Data&gt;" contractName="SlaveService.ISlaveFacade" name="SlaveHttpEndpoint" />
     <endpoint normalizedDigest="&lt;?xml version=&quot;1.0&quot; encoding=&quot;utf-16&quot;?&gt;&lt;Data address=&quot;http://localhost:9000/SlaveService/mex&quot; binding=&quot;wsHttpBinding&quot; bindingConfiguration=&quot;SlaveMexEndpoint&quot; contract=&quot;SlaveService.ISlaveFacade&quot; name=&quot;SlaveMexEndpoint&quot; /&gt;" digest="&lt;?xml version=&quot;1.0&quot; encoding=&quot;utf-16&quot;?&gt;&lt;Data address=&quot;http://localhost:9000/SlaveService/mex&quot; binding=&quot;wsHttpBinding&quot; bindingConfiguration=&quot;SlaveMexEndpoint&quot; contract=&quot;SlaveService.ISlaveFacade&quot; name=&quot;SlaveMexEndpoint&quot; /&gt;" contractName="SlaveService.ISlaveFacade" name="SlaveMexEndpoint" />
     <endpoint normalizedDigest="&lt;?xml version=&quot;1.0&quot; encoding=&quot;utf-16&quot;?&gt;&lt;Data address=&quot;net.tcp://localhost:9001/SlaveServiceStreamed&quot; binding=&quot;netTcpBinding&quot; bindingConfiguration=&quot;SlaveTcpStreamedEndpoint&quot; contract=&quot;SlaveService.ISlaveFacade&quot; name=&quot;SlaveTcpStreamedEndpoint&quot;&gt;&lt;identity&gt;&lt;dns value=&quot;localhost&quot; /&gt;&lt;/identity&gt;&lt;/Data&gt;" digest="&lt;?xml version=&quot;1.0&quot; encoding=&quot;utf-16&quot;?&gt;&lt;Data address=&quot;net.tcp://localhost:9001/SlaveServiceStreamed&quot; binding=&quot;netTcpBinding&quot; bindingConfiguration=&quot;SlaveTcpStreamedEndpoint&quot; contract=&quot;SlaveService.ISlaveFacade&quot; name=&quot;SlaveTcpStreamedEndpoint&quot;&gt;&lt;identity&gt;&lt;dns value=&quot;localhost&quot; /&gt;&lt;/identity&gt;&lt;/Data&gt;" contractName="SlaveService.ISlaveFacade" name="SlaveTcpStreamedEndpoint" />

branches/3.3-Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Slave.Communication/3.3/Service References/SlaveService/configuration91.svcinfo

@@ -1 +1 @@
 <?xml version="1.0" encoding="utf-8"?>
-<SavedWcfConfigurationInformation xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" Version="9.1" CheckSum="IVbHOGoLIiHm7HALbaYOYdLHHj8=">
+<SavedWcfConfigurationInformation xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" Version="9.1" CheckSum="T11XGf41DbSFPlmAHGf/VqqlcJw=">
   <bindingConfigurations>
     <bindingConfiguration bindingType="netTcpBinding" name="SlaveTcpStreamedEndpoint">
@@ -421 +421 @@
         </property>
         <property path="/identity/certificate/encodedValue" isComplexType="false" isExplicitlyDefined="true" clrType="System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-          <serializedValue>AwAAAAEAAAAUAAAAeBLH/0jWrlsW42fIC8VIIdAE6PUgAAAAAQAAAPIBAAAwggHuMIIBW6ADAgECAhDez3CoJIIitEZ5xwVqLJn6MAkGBSsOAwIdBQAwFDESMBAGA1UEAxMJbG9jYWxob3N0MB4XDTEwMDgyMzE1NTg0OFoXDTM5MTIzMTIzNTk1OVowFDESMBAGA1UEAxMJbG9jYWxob3N0MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCmOgweB6X4Ss6W2xb2hg1x61cjD2T7SO0ckkzmtqRhC2UWly9dBnonFJmg9RjN0y6l2tZhVzNhq8DgCkn3hPg5GL3XIwYX4PsXwNmeT6i+7s6rGbESuaEMvYOAQJSJ+MTgBvXCwo2g5nFHIBqP4W4aU2eybxP7H4cm1rQpoYHHjQIDAQABo0kwRzBFBgNVHQEEPjA8gBASDhO/IE7Ff7PpkCVF8oUpoRYwFDESMBAGA1UEAxMJbG9jYWxob3N0ghDez3CoJIIitEZ5xwVqLJn6MAkGBSsOAwIdBQADgYEAhxAzm3JTV7j51jti5P7izTEs7+8534kQloeAJDwlKolkd4ZMkf0BiexC2Vt1KsnxUjrK0HbbITzazkvkAmKi7dP+4G+3SrWag5lS4NcoPjTQy16T3zC9E6yafRaZp1/pxjC3Ap44qwq4Kjl2mEjeHHsdie/h4loowTqC9FlLbgo=</serializedValue>
+          <serializedValue>AwAAAAEAAAAUAAAAJ5p7xBv8o/BZ9Lp1c1d+F13FxN8gAAAAAQAAAPIBAAAwggHuMIIBW6ADAgECAhBvZlgTCjsfjEG5QUX7yOhOMAkGBSsOAwIdBQAwFDESMBAGA1UEAxMJbG9jYWxob3N0MB4XDTEwMDgzMDA5MTMyMVoXDTM5MTIzMTIzNTk1OVowFDESMBAGA1UEAxMJbG9jYWxob3N0MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCbjJrhOtSpfFz51JPvdfxMVSKqnWhfzjrZvtwpVsy8D589m3SeS6AalWwtkpPCR2C+a4GKo9e689o0+BtuOugypAWqkUhkz//XLvUp5KPNB7igY7he4ngMLp4GsWBWZdl+P8g29t5+nde1Tiv6dPzx5YgfB9lrvZzaS6TT/eNasQIDAQABo0kwRzBFBgNVHQEEPjA8gBBPTuRH17g8MfpeT/ODWdXuoRYwFDESMBAGA1UEAxMJbG9jYWxob3N0ghBvZlgTCjsfjEG5QUX7yOhOMAkGBSsOAwIdBQADgYEAUpgK4sUxAqwR8eyRK8cmyzhhN31xN8/nKPIo9cETaNvjJXL8zO7DeXCyyiBETAkfnhIChRIAmE/PjxvFdB2fOuQY3/OHrobai+G7IQ8SHF+AKdx7cJXt0h4Okny4DpPjQl4V9P2lZaG8fVXmpKhpeZ+ChA8Y/xPCDzTzLleQ/mY=</serializedValue>
         </property>
         <property path="/identity/certificateReference" isComplexType="true" isExplicitlyDefined="false" clrType="System.ServiceModel.Configuration.CertificateReferenceElement, System.ServiceModel, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">

branches/3.3-Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Slave.Communication/3.3/SlaveServicePool.cs

@@ -8 +8 @@
 using HeuristicLab.Hive.Slave.Communication.Properties;
 using HeuristicLab.Tracing;
+using System.ServiceModel.Security;
 
 namespace HeuristicLab.Hive.Slave.Communication {
@@ -42 +43 @@
     internal ISlaveFacade CreateStreamedSlaveFacade() {
       lock (locker) {
-        if (cachedSlaveFacadeClientStreamed == null) {
-          cachedSlaveFacadeClientStreamed = new SlaveFacadeClient("SlaveTcpStreamedEndpoint");
-          WcfSettings.SetEndpointAddress(cachedSlaveFacadeClientStreamed.Endpoint, this.serverIp);
-          SetCredentials(cachedSlaveFacadeClientStreamed);
-          cachedSlaveFacadeClientStreamed.Open();
-          Logger.Debug("Created SlaveFacadeClientStreamed");
+        try {
+          if (cachedSlaveFacadeClientStreamed == null) {
+            cachedSlaveFacadeClientStreamed = new SlaveFacadeClient("SlaveTcpStreamedEndpoint");
+            WcfSettings.SetEndpointAddress(cachedSlaveFacadeClientStreamed.Endpoint, this.serverIp);
+            SetCredentials(cachedSlaveFacadeClientStreamed);
+            cachedSlaveFacadeClientStreamed.Open();
+            Logger.Debug("Created SlaveFacadeClientStreamed");
+          }
+          streamedClientCount++;
+          Logger.Debug("SlaveFacadeClientCount: " + streamedClientCount);
+          return cachedSlaveFacadeClientStreamed;
         }
-        streamedClientCount++;
-        Logger.Debug("SlaveFacadeClientCount: " + streamedClientCount);
-        return cachedSlaveFacadeClientStreamed;
+        catch (MessageSecurityException exception) {
+          // more info in innerexception, probably credentials are wrong
+          throw exception.InnerException;
+        }
       }
     }
 
     private void SetCredentials(SlaveFacadeClient client) {
+      Logger.Debug("Setting credentials for user \"" + Settings.Default.HiveUsername + "\"");
       client.ClientCredentials.UserName.UserName = Settings.Default.HiveUsername;
       client.ClientCredentials.UserName.Password = Settings.Default.HivePassword;
@@ -62 +70 @@
     public void DisposeSlaveClient(ISlaveFacade slaveFacade) {
       lock (locker) {
-        if (slaveFacade == cachedSlaveFacadeClient) {
-          clientCount--;
-          Logger.Debug("Disposing SlaveFacadeClient. Count: " + clientCount);
-          if (clientCount < 0)
-            throw new Exception("SlaveFacadeClient Count is less than zero. It was released too often.");
-          if (clientCount == 0) {
-            WcfSettings.DisposeWcfClient((ICommunicationObject)slaveFacade);
-            cachedSlaveFacadeClient = null;
+        if (slaveFacade != null) {
+          if (slaveFacade == cachedSlaveFacadeClient) {
+            clientCount--;
+            Logger.Debug("Disposing SlaveFacadeClient. Count: " + clientCount);
+            if (clientCount < 0)
+              throw new Exception("SlaveFacadeClient Count is less than zero. It was released too often.");
+            if (clientCount == 0) {
+              WcfSettings.DisposeWcfClient((ICommunicationObject)slaveFacade);
+              cachedSlaveFacadeClient = null;
+            }
+          } else if (slaveFacade == cachedSlaveFacadeClientStreamed) {
+            streamedClientCount--;
+            Logger.Debug("Disposing SlaveFacadeClientStreamed. Count: " + streamedClientCount);
+            if (streamedClientCount < 0)
+              throw new Exception("SlaveFacadeClientStreamed Count is less than zero. It was released too often.");
+            if (streamedClientCount == 0) {
+              WcfSettings.DisposeWcfClient((ICommunicationObject)slaveFacade);
+              cachedSlaveFacadeClientStreamed = null;
+            }
+          } else {
+            throw new Exception("Cannot dispose slaveFacade. Cannot be found in cache.");
           }
-        } else if (slaveFacade == cachedSlaveFacadeClientStreamed) {
-          streamedClientCount--;
-          Logger.Debug("Disposing SlaveFacadeClientStreamed. Count: " + streamedClientCount);
-          if (streamedClientCount < 0)
-            throw new Exception("SlaveFacadeClientStreamed Count is less than zero. It was released too often.");
-          if (streamedClientCount == 0) {
-            WcfSettings.DisposeWcfClient((ICommunicationObject)slaveFacade);
-            cachedSlaveFacadeClientStreamed = null;
-          }
-        } else {
-          throw new Exception("Cannot dispose slaveFacade. Cannot be found in cache.");
         }
       } // lock

branches/3.3-Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Slave.Communication/3.3/app.config

@@ -7 +7 @@
   </configSections>
   <system.serviceModel>
+    <bindings>
+      <netTcpBinding>
+        <binding name="SlaveTcpStreamedEndpoint" closeTimeout="00:01:00"
+          openTimeout="00:01:00" receiveTimeout="00:10:00" sendTimeout="00:01:00"
+          transactionFlow="false" transferMode="Streamed" transactionProtocol="OleTransactions"
+          hostNameComparisonMode="StrongWildcard" listenBacklog="10" maxBufferPoolSize="524288"
+          maxBufferSize="65536" maxConnections="10" maxReceivedMessageSize="104857600">
+          <readerQuotas maxDepth="32" maxStringContentLength="104857600" maxArrayLength="104857600"
+            maxBytesPerRead="4096" maxNameTableCharCount="16384" />
+          <reliableSession ordered="true" inactivityTimeout="00:10:00"
+            enabled="false" />
+          <security mode="TransportWithMessageCredential">
+            <transport clientCredentialType="Windows" protectionLevel="EncryptAndSign" />
+            <message clientCredentialType="UserName" algorithmSuite="Default" />
+          </security>
+        </binding>
+      </netTcpBinding>
+      <wsHttpBinding>
+        <binding name="SlaveHttpEndpoint" closeTimeout="00:01:00" openTimeout="00:01:00"
+          receiveTimeout="00:10:00" sendTimeout="00:01:00" bypassProxyOnLocal="false"
+          transactionFlow="false" hostNameComparisonMode="StrongWildcard"
+          maxBufferPoolSize="524288" maxReceivedMessageSize="65536" messageEncoding="Text"
+          textEncoding="utf-8" useDefaultWebProxy="true" allowCookies="false">
+          <readerQuotas maxDepth="32" maxStringContentLength="8192" maxArrayLength="16384"
+            maxBytesPerRead="4096" maxNameTableCharCount="16384" />
+          <reliableSession ordered="true" inactivityTimeout="00:10:00"
+            enabled="false" />
+          <security mode="Message">
+            <transport clientCredentialType="Windows" proxyCredentialType="None"
+              realm="" />
+            <message clientCredentialType="UserName" negotiateServiceCredential="true"
+              algorithmSuite="Default" />
+          </security>
+        </binding>
+      </wsHttpBinding>
+    </bindings>
+    <client>
+      <endpoint address="http://localhost:9000/SlaveService" binding="wsHttpBinding" behaviorConfiguration="SlaveServiceBehaviour"
+        bindingConfiguration="SlaveHttpEndpoint" contract="SlaveService.ISlaveFacade"
+        name="SlaveHttpEndpoint">
+        <identity>
+          <certificate encodedValue="AwAAAAEAAAAUAAAAJ5p7xBv8o/BZ9Lp1c1d+F13FxN8gAAAAAQAAAPIBAAAwggHuMIIBW6ADAgECAhBvZlgTCjsfjEG5QUX7yOhOMAkGBSsOAwIdBQAwFDESMBAGA1UEAxMJbG9jYWxob3N0MB4XDTEwMDgzMDA5MTMyMVoXDTM5MTIzMTIzNTk1OVowFDESMBAGA1UEAxMJbG9jYWxob3N0MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCbjJrhOtSpfFz51JPvdfxMVSKqnWhfzjrZvtwpVsy8D589m3SeS6AalWwtkpPCR2C+a4GKo9e689o0+BtuOugypAWqkUhkz//XLvUp5KPNB7igY7he4ngMLp4GsWBWZdl+P8g29t5+nde1Tiv6dPzx5YgfB9lrvZzaS6TT/eNasQIDAQABo0kwRzBFBgNVHQEEPjA8gBBPTuRH17g8MfpeT/ODWdXuoRYwFDESMBAGA1UEAxMJbG9jYWxob3N0ghBvZlgTCjsfjEG5QUX7yOhOMAkGBSsOAwIdBQADgYEAUpgK4sUxAqwR8eyRK8cmyzhhN31xN8/nKPIo9cETaNvjJXL8zO7DeXCyyiBETAkfnhIChRIAmE/PjxvFdB2fOuQY3/OHrobai+G7IQ8SHF+AKdx7cJXt0h4Okny4DpPjQl4V9P2lZaG8fVXmpKhpeZ+ChA8Y/xPCDzTzLleQ/mY=" />
+        </identity>
+      </endpoint>
+      <endpoint address="net.tcp://localhost:9001/SlaveServiceStreamed" behaviorConfiguration="SlaveServiceBehaviour"
+        binding="netTcpBinding" bindingConfiguration="SlaveTcpStreamedEndpoint"
+        contract="SlaveService.ISlaveFacade" name="SlaveTcpStreamedEndpoint">
+        <identity>
+          <dns value="localhost" />
+        </identity>
+      </endpoint>
+    </client>
     <behaviors>
       <endpointBehaviors>
@@ -18 +70 @@
       </endpointBehaviors>
     </behaviors>
-    <bindings>
-      <netTcpBinding>
-        <binding name="SlaveTcpStreamedEndpoint" closeTimeout="00:01:00"
-          openTimeout="00:01:00" receiveTimeout="00:10:00" sendTimeout="00:10:00"
-          transactionFlow="false" transferMode="Streamed" transactionProtocol="OleTransactions"
-          hostNameComparisonMode="StrongWildcard" maxBufferPoolSize="104857600"
-          maxBufferSize="104857600" maxReceivedMessageSize="104857600">
-          <readerQuotas maxDepth="32" maxStringContentLength="104857600"
-            maxArrayLength="104857600" maxBytesPerRead="4096" maxNameTableCharCount="16384" />
-          <reliableSession ordered="true" inactivityTimeout="00:10:00"
-            enabled="false" />
-          <security mode="TransportWithMessageCredential">
-            <transport clientCredentialType="Windows" protectionLevel="EncryptAndSign" />
-            <message clientCredentialType="UserName" algorithmSuite="Default" />
-          </security>
-        </binding>
-      </netTcpBinding>
-      <wsHttpBinding>
-        <binding name="SlaveHttpEndpoint" closeTimeout="00:01:00" openTimeout="00:01:00"
-          receiveTimeout="00:10:00" sendTimeout="00:10:00" bypassProxyOnLocal="false"
-          transactionFlow="false" hostNameComparisonMode="StrongWildcard"
-          maxBufferPoolSize="104857600" maxReceivedMessageSize="104857600"
-          messageEncoding="Text" textEncoding="utf-8" useDefaultWebProxy="true"
-          allowCookies="false">
-          <readerQuotas maxDepth="32" maxStringContentLength="8192" maxArrayLength="16384"
-            maxBytesPerRead="4096" maxNameTableCharCount="16384" />
-          <reliableSession ordered="true" inactivityTimeout="00:10:00"
-            enabled="false" />
-          <security mode="Message">
-            <transport clientCredentialType="Windows" proxyCredentialType="None"
-              realm="" />
-            <message clientCredentialType="UserName" negotiateServiceCredential="true"
-              algorithmSuite="Default" />
-          </security>
-        </binding>
-        <binding name="SlaveMexEndpoint" closeTimeout="00:01:00" openTimeout="00:01:00"
-          receiveTimeout="00:10:00" sendTimeout="00:01:00" bypassProxyOnLocal="false"
-          transactionFlow="false" hostNameComparisonMode="StrongWildcard"
-          maxBufferPoolSize="524288" maxReceivedMessageSize="65536" messageEncoding="Text"
-          textEncoding="utf-8" useDefaultWebProxy="true" allowCookies="false">
-          <readerQuotas maxDepth="32" maxStringContentLength="8192" maxArrayLength="16384"
-            maxBytesPerRead="4096" maxNameTableCharCount="16384" />
-          <reliableSession ordered="true" inactivityTimeout="00:10:00"
-            enabled="false" />
-          <security mode="None">
-            <transport clientCredentialType="Windows" proxyCredentialType="None"
-              realm="" />
-            <message clientCredentialType="Windows" negotiateServiceCredential="true" />
-          </security>
-        </binding>
-      </wsHttpBinding>
-    </bindings>
-    <client>
-      <endpoint address="http://localhost:9000/SlaveService" binding="wsHttpBinding" behaviorConfiguration="SlaveServiceBehaviour"
-        bindingConfiguration="SlaveHttpEndpoint" contract="SlaveService.ISlaveFacade"
-        name="SlaveHttpEndpoint">
-        <identity>
-          <certificate encodedValue="AwAAAAEAAAAUAAAAeBLH/0jWrlsW42fIC8VIIdAE6PUgAAAAAQAAAPIBAAAwggHuMIIBW6ADAgECAhDez3CoJIIitEZ5xwVqLJn6MAkGBSsOAwIdBQAwFDESMBAGA1UEAxMJbG9jYWxob3N0MB4XDTEwMDgyMzE1NTg0OFoXDTM5MTIzMTIzNTk1OVowFDESMBAGA1UEAxMJbG9jYWxob3N0MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCmOgweB6X4Ss6W2xb2hg1x61cjD2T7SO0ckkzmtqRhC2UWly9dBnonFJmg9RjN0y6l2tZhVzNhq8DgCkn3hPg5GL3XIwYX4PsXwNmeT6i+7s6rGbESuaEMvYOAQJSJ+MTgBvXCwo2g5nFHIBqP4W4aU2eybxP7H4cm1rQpoYHHjQIDAQABo0kwRzBFBgNVHQEEPjA8gBASDhO/IE7Ff7PpkCVF8oUpoRYwFDESMBAGA1UEAxMJbG9jYWxob3N0ghDez3CoJIIitEZ5xwVqLJn6MAkGBSsOAwIdBQADgYEAhxAzm3JTV7j51jti5P7izTEs7+8534kQloeAJDwlKolkd4ZMkf0BiexC2Vt1KsnxUjrK0HbbITzazkvkAmKi7dP+4G+3SrWag5lS4NcoPjTQy16T3zC9E6yafRaZp1/pxjC3Ap44qwq4Kjl2mEjeHHsdie/h4loowTqC9FlLbgo=" />
-        </identity>
-      </endpoint>
-      <endpoint address="http://localhost:9000/SlaveService/mex" binding="wsHttpBinding" behaviorConfiguration="SlaveMexEndpoint"
-        bindingConfiguration="SlaveMexEndpoint" contract="SlaveService.ISlaveFacade"
-        name="SlaveMexEndpoint" />
-      <endpoint address="net.tcp://localhost:9001/SlaveServiceStreamed" behaviorConfiguration="SlaveServiceBehaviour"
-        binding="netTcpBinding" bindingConfiguration="SlaveTcpStreamedEndpoint"
-        contract="SlaveService.ISlaveFacade" name="SlaveTcpStreamedEndpoint">
-        <identity>
-          <dns value="localhost" />
-        </identity>
-      </endpoint>
-    </client>
+    
   </system.serviceModel>
   <userSettings>