From 3bea400676038cd993cc659807904dcc78b12a32 Mon Sep 17 00:00:00 2001
From: Maxime Graulich <maxime.graulich@gmail.com>
Date: Sat, 13 Dec 2014 12:15:03 +0000
Subject: [PATCH]
---
Common/GmshMessage.cpp | 6 +++++-
contrib/onelab2/OnelabServer.h | 2 +-
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/Common/GmshMessage.cpp b/Common/GmshMessage.cpp
index 66851fa8aa..7ab096cfa9 100644
--- a/Common/GmshMessage.cpp
+++ b/Common/GmshMessage.cpp
@@ -786,6 +786,10 @@ public:
void Msg::InitializeOnelab(const std::string &name, const std::string &sockname)
{
#ifdef HAVE_ONELAB2
+ if(_onelabClient) {
+ delete _onelabClient;
+ _onelabClient = 0;
+ }
if(sockname.empty()){
if(name != "Gmsh"){ // load db from file:
FILE *fp = Fopen(name.c_str(), "rb");
@@ -805,7 +809,7 @@ void Msg::InitializeOnelab(const std::string &name, const std::string &sockname)
address = ip4_inet_pton(sockname.substr(0,colon).c_str());
port = atoi(sockname.substr(colon+1).c_str());
}
- GmshNetworkClient *c = OnelabDatabase::instance()->useAsNetworkClient(address, port, "Gmsh");
+ GmshNetworkClient *c = OnelabDatabase::instance()->useAsNetworkClient(address, port, name);
if(c == NULL) {
Error("Unable to connect ONELAB server");
Exit(1);
diff --git a/contrib/onelab2/OnelabServer.h b/contrib/onelab2/OnelabServer.h
index 1db3bbae54..22c8249994 100644
--- a/contrib/onelab2/OnelabServer.h
+++ b/contrib/onelab2/OnelabServer.h
@@ -87,8 +87,8 @@ public:
}
std::map<std::string, bool> clients = p.getClients();
for(std::map<std::string, bool>::const_iterator it = clients.begin(); it != clients.end(); it++) {
- std::cout << "send " << p.getName() << " to " << it->first << " from " << client << std::endl;
if(it->first == client) continue;
+ std::cout << "send " << p.getName() << " to " << it->first << " from " << client << std::endl;
OnelabLocalNetworkClient *tmp = getClient(it->first);
if(tmp == NULL) continue;
tmp->updateParameter(pp);
--
GitLab