Skip to content
Snippets Groups Projects
Commit 7a977f0e authored by Francois Henrotte's avatar Francois Henrotte
Browse files

avoid hanging when the HAVE_ONELAB_METAMODEL is not activated

parent 4e50fae5
No related branches found
No related tags found
No related merge requests found
...@@ -401,6 +401,7 @@ bool gmshLocalNetworkClient::receiveMessage(gmshLocalNetworkClient *master) ...@@ -401,6 +401,7 @@ bool gmshLocalNetworkClient::receiveMessage(gmshLocalNetworkClient *master)
break; break;
case GmshSocket::GMSH_OLPARSE: case GmshSocket::GMSH_OLPARSE:
{ {
std::string reply = "unavailable";
#if defined(HAVE_ONELAB_METAMODEL) #if defined(HAVE_ONELAB_METAMODEL)
std::string::size_type first = 0; std::string::size_type first = 0;
std::string clientName = onelab::parameter::getNextToken(message, first); std::string clientName = onelab::parameter::getNextToken(message, first);
...@@ -408,15 +409,13 @@ bool gmshLocalNetworkClient::receiveMessage(gmshLocalNetworkClient *master) ...@@ -408,15 +409,13 @@ bool gmshLocalNetworkClient::receiveMessage(gmshLocalNetworkClient *master)
if (!onelab::server::instance()->isRegistered(clientName)){ if (!onelab::server::instance()->isRegistered(clientName)){
preProcess(clientName, fullName); // contrib/onelab/OnelabParser.cpp preProcess(clientName, fullName); // contrib/onelab/OnelabParser.cpp
Msg::Info("Preprocess file <%s> done", fullName.c_str()); Msg::Info("Preprocess file <%s> done", fullName.c_str());
reply = onelab::server::instance()->getChanged(clientName) ? "true" : "false";
std::string reply = onelab::server::instance()->getChanged(clientName) ?
"true" : "false";
getGmshServer()->SendMessage
(GmshSocket::GMSH_OLPARSE, reply.size(), &reply[0]);
} }
else else
Msg::Error("Redefinition of existing client <%s>",clientName.c_str()); Msg::Error("Redefinition of existing client <%s>",clientName.c_str());
#endif #endif
getGmshServer()->SendMessage
(GmshSocket::GMSH_OLPARSE, reply.size(), &reply[0]);
} }
break; break;
case GmshSocket::GMSH_CLIENT_CHANGED: case GmshSocket::GMSH_CLIENT_CHANGED:
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment