Skip site navigation (1)Skip section navigation (2) 
Date:      Tue, 15 Nov 2016 14:52:35 +0000 (UTC)
From:      Michael Gmelin <grembo@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r426170 - in head/devel/ice: . files
Message-ID:  <201611151452.uAFEqZAZ009305@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help 
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();

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201611151452.uAFEqZAZ009305>