From 7e3d2aaba187e314d0748075179ac34443ae369c Mon Sep 17 00:00:00 2001 From: secher Date: Thu, 26 Nov 2009 14:52:36 +0000 Subject: [PATCH] if cluster internal protocol is not specified, it is equal to protocol --- src/ResourcesManager/SALOME_ResourcesCatalog_Handler.cxx | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/ResourcesManager/SALOME_ResourcesCatalog_Handler.cxx b/src/ResourcesManager/SALOME_ResourcesCatalog_Handler.cxx index ee24f2565..be5a7661e 100755 --- a/src/ResourcesManager/SALOME_ResourcesCatalog_Handler.cxx +++ b/src/ResourcesManager/SALOME_ResourcesCatalog_Handler.cxx @@ -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)) { -- 2.39.2