Date: Thu, 7 Sep 2017 18:28:12 +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: r449413 - in head/devel/ice: . files Message-ID: <201709071828.v87ISCsT077455@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: grembo Date: Thu Sep 7 18:28:12 2017 New Revision: 449413 URL: https://svnweb.freebsd.org/changeset/ports/449413 Log: Fixed IceGrid node bug where a replica might not get up-to-date object adapter information about a server if an update is pending for this server. See also: https://github.com/zeroc-ice/ice/pull/18 Modified: head/devel/ice/Makefile head/devel/ice/files/patch-cpp-src-IceGrid-ServerI.cpp Modified: head/devel/ice/Makefile ============================================================================== --- head/devel/ice/Makefile Thu Sep 7 18:18:36 2017 (r449412) +++ head/devel/ice/Makefile Thu Sep 7 18:28:12 2017 (r449413) @@ -3,7 +3,7 @@ PORTNAME= Ice PORTVERSION= 3.6.3 -PORTREVISION= 2 +PORTREVISION= 3 DISTVERSIONPREFIX= v CATEGORIES= devel Modified: head/devel/ice/files/patch-cpp-src-IceGrid-ServerI.cpp ============================================================================== --- head/devel/ice/files/patch-cpp-src-IceGrid-ServerI.cpp Thu Sep 7 18:18:36 2017 (r449412) +++ head/devel/ice/files/patch-cpp-src-IceGrid-ServerI.cpp Thu Sep 7 18:28:12 2017 (r449413) @@ -1,5 +1,5 @@ --- 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 ++++ cpp/src/IceGrid/ServerI.cpp 2017-09-07 12:48:01.409625996 +0100 @@ -341,7 +341,22 @@ { assert(_p->first.find("config_") == 0); @@ -24,3 +24,12 @@ if(_traceLevels->server > 1) { const string id = _server->getId(); +@@ -1232,7 +1232,7 @@ ServerI::load(const AMD_Node_loadServerPtr& amdCB, const InternalServerDescripto + updateRevision(desc->uuid, desc->revision); + } + +- if(!_desc) ++ if(!_desc || (_load && descriptorUpdated(_load->getInternalServerDescriptor(), _desc))) + { + _load->addCallback(amdCB); + return 0;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201709071828.v87ISCsT077455>