From owner-svn-ports-head@freebsd.org Tue Nov 15 14:52:36 2016 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id E0F15C432DE; Tue, 15 Nov 2016 14:52:36 +0000 (UTC) (envelope-from grembo@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 965A0828; Tue, 15 Nov 2016 14:52:36 +0000 (UTC) (envelope-from grembo@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id uAFEqZfH009307; Tue, 15 Nov 2016 14:52:35 GMT (envelope-from grembo@FreeBSD.org) Received: (from grembo@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id uAFEqZAZ009305; Tue, 15 Nov 2016 14:52:35 GMT (envelope-from grembo@FreeBSD.org) Message-Id: <201611151452.uAFEqZAZ009305@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: grembo set sender to grembo@FreeBSD.org using -f From: Michael Gmelin Date: Tue, 15 Nov 2016 14:52:35 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r426170 - in head/devel/ice: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Nov 2016 14:52:37 -0000 Author: grembo Date: Tue Nov 15 14:52:35 2016 New Revision: 426170 URL: https://svnweb.freebsd.org/changeset/ports/426170 Log: Fix icegridnode, so it applies property changes to shared communicators correctly. Without this fix, updates to icebox applications that use a shared communicator will fail silently (unless specific trace properties are set), which also stops other configuration changes to propagate properly. This will also be escalated to upstream. Approved by: mentors (implicit) Added: head/devel/ice/files/patch-cpp-src-IceGrid-ServerI.cpp (contents, props changed) Modified: head/devel/ice/Makefile Modified: head/devel/ice/Makefile ============================================================================== --- head/devel/ice/Makefile Tue Nov 15 14:20:24 2016 (r426169) +++ head/devel/ice/Makefile Tue Nov 15 14:52:35 2016 (r426170) @@ -3,6 +3,7 @@ PORTNAME= Ice PORTVERSION= 3.6.3 +PORTREVISION= 1 DISTVERSIONPREFIX= v CATEGORIES= devel Added: head/devel/ice/files/patch-cpp-src-IceGrid-ServerI.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/ice/files/patch-cpp-src-IceGrid-ServerI.cpp Tue Nov 15 14:52:35 2016 (r426170) @@ -0,0 +1,26 @@ +--- cpp/src/IceGrid/ServerI.cpp.orig 2016-11-15 12:22:54.201742997 +0100 ++++ cpp/src/IceGrid/ServerI.cpp 2016-11-15 12:48:01.409625996 +0100 +@@ -341,7 +341,22 @@ + { + assert(_p->first.find("config_") == 0); + const string service = _p->first.substr(7); +- facet = "IceBox.Service." + service + ".Properties"; ++ bool useSharedCommunicator = false; ++ for (PropertyDescriptorSeq::const_iterator d = _properties.at("config").begin(); d != _properties.at("config").end(); ++d) ++ { ++ if (d->name == "IceBox.UseSharedCommunicator." + service) ++ { ++ useSharedCommunicator = (atoi(d->value.c_str()) > 0); ++ } ++ } ++ if (useSharedCommunicator) ++ { ++ facet = "IceBox.SharedCommunicator.Properties"; ++ } ++ else ++ { ++ facet = "IceBox.Service." + service + ".Properties"; ++ } + if(_traceLevels->server > 1) + { + const string id = _server->getId();