freebsd-ports/devel/ice/files/patch-cpp-src-IceGrid-Database.cpp
Michael Gmelin a9fd01f491 This adds patches No 3 [1] and No 5 [2] from upstream.
Also fixes LIB_DEPENDS handling (previous versions of the slave
ports won't depend on libIce.so), move LIB_DEPENDS and LIB_VRS
for slaves to master, upgrade to USES= python

[1] http://www.zeroc.com/forums/patches/6183-patch-3-ice-3-5-1-marshaling-bug-nested-optionals.html
[2] http://www.zeroc.com/forums/patches/6285-patch-5-ice-3-5-1-fix-icegrid-registry-issue-shared-replica-groups.html

Approved by:	mentors (implicit)
2014-09-12 18:06:17 +00:00

11 lines
532 B
C++

--- cpp/src/IceGrid/Database.cpp.orig 2013-03-11 15:19:47.000000000 +0000
+++ cpp/src/IceGrid/Database.cpp 2014-09-08 14:21:13.335195726 +0000
@@ -2088,7 +2088,7 @@ Database::reload(const ApplicationHelper& oldApp,
{
ReplicaGroupEntryPtr entry = ReplicaGroupEntryPtr::dynamicCast(_adapterCache.get(r->id));
assert(entry);
- entry->update(r->loadBalancing);
+ entry->update(application, r->loadBalancing);
}
catch(const AdapterNotExistException&)
{