diff options
| author | grembo <grembo@FreeBSD.org> | 2017-09-08 02:28:12 +0800 |
|---|---|---|
| committer | grembo <grembo@FreeBSD.org> | 2017-09-08 02:28:12 +0800 |
| commit | 5024a313169afa1f598e696bef009fb92e737a59 (patch) | |
| tree | 5cfb95c5cc8707dde7ca4cdd7ece1bd7a60f34d5 /devel | |
| parent | 5b42c9939e56654a67a5fe2640634c1260f0b03b (diff) | |
| download | freebsd-ports-gnome-5024a313169afa1f598e696bef009fb92e737a59.tar.gz freebsd-ports-gnome-5024a313169afa1f598e696bef009fb92e737a59.tar.zst freebsd-ports-gnome-5024a313169afa1f598e696bef009fb92e737a59.zip | |
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
Diffstat (limited to 'devel')
| -rw-r--r-- | devel/ice/Makefile | 2 | ||||
| -rw-r--r-- | devel/ice/files/patch-cpp-src-IceGrid-ServerI.cpp | 11 |
2 files changed, 11 insertions, 2 deletions
diff --git a/devel/ice/Makefile b/devel/ice/Makefile index af6c7c07d793..ab2de3e2c7e5 100644 --- a/devel/ice/Makefile +++ b/devel/ice/Makefile @@ -3,7 +3,7 @@ PORTNAME= Ice PORTVERSION= 3.6.3 -PORTREVISION= 2 +PORTREVISION= 3 DISTVERSIONPREFIX= v CATEGORIES= devel diff --git a/devel/ice/files/patch-cpp-src-IceGrid-ServerI.cpp b/devel/ice/files/patch-cpp-src-IceGrid-ServerI.cpp index 83a3eade43b4..128820ca8e00 100644 --- a/devel/ice/files/patch-cpp-src-IceGrid-ServerI.cpp +++ b/devel/ice/files/patch-cpp-src-IceGrid-ServerI.cpp @@ -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; |