From owner-svn-ports-head@freebsd.org Thu Sep 7 18:28:14 2017 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 1F8F5E0731F; Thu, 7 Sep 2017 18:28:14 +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 93AFB6F28F; Thu, 7 Sep 2017 18:28:13 +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 v87ISCoR077457; Thu, 7 Sep 2017 18:28:12 GMT (envelope-from grembo@FreeBSD.org) Received: (from grembo@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v87ISCsT077455; Thu, 7 Sep 2017 18:28:12 GMT (envelope-from grembo@FreeBSD.org) Message-Id: <201709071828.v87ISCsT077455@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: grembo set sender to grembo@FreeBSD.org using -f From: Michael Gmelin Date: Thu, 7 Sep 2017 18:28:12 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r449413 - in head/devel/ice: . files X-SVN-Group: ports-head X-SVN-Commit-Author: grembo X-SVN-Commit-Paths: in head/devel/ice: . files X-SVN-Commit-Revision: 449413 X-SVN-Commit-Repository: ports 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: Thu, 07 Sep 2017 18:28:14 -0000 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;