]> SALOME platform Git repositories - modules/kernel.git/commitdiff
Salome HOME
if cluster internal protocol is not specified, it is equal to protocol
authorsecher <secher>
Thu, 26 Nov 2009 14:52:36 +0000 (14:52 +0000)
committersecher <secher>
Thu, 26 Nov 2009 14:52:36 +0000 (14:52 +0000)
src/ResourcesManager/SALOME_ResourcesCatalog_Handler.cxx

index ee24f2565b46ff304588b05ce085da2a26e26cf6..be5a7661e81cff331e9d00810b7b2af6b2d46dc6 100755 (executable)
@@ -474,8 +474,8 @@ SALOME_ResourcesCatalog_Handler::ProcessMachine(xmlNodePtr machine_descr, Parser
 
   if (xmlHasProp(machine_descr, (const xmlChar*)test_cluster_internal_protocol))
   {
-    xmlChar* protocol= xmlGetProp(machine_descr, (const xmlChar*)test_cluster_internal_protocol);
-    switch ( protocol[0])
+    xmlChar* iprotocol= xmlGetProp(machine_descr, (const xmlChar*)test_cluster_internal_protocol);
+    switch ( iprotocol[0])
     {
       case 'r':
        resource.ClusterInternalProtocol = rsh;
@@ -488,10 +488,10 @@ SALOME_ResourcesCatalog_Handler::ProcessMachine(xmlNodePtr machine_descr, Parser
        resource.ClusterInternalProtocol = rsh;
        break;
     }
-    xmlFree(protocol);
+    xmlFree(iprotocol);
   }
   else
-    resource.ClusterInternalProtocol = rsh;
+    resource.ClusterInternalProtocol = resource.Protocol;
 
   if (xmlHasProp(machine_descr, (const xmlChar*)test_mode))
   {