svn commit: r418315 - in head/devel/ice: . files
Michael Gmelin
grembo at FreeBSD.org
Sun Jul 10 12:47:33 UTC 2016
Author: grembo
Date: Sun Jul 10 12:47:32 2016
New Revision: 418315
URL: https://svnweb.freebsd.org/changeset/ports/418315
Log:
Fix icegridadmin's handling of properties on shared communicators
See also:
https://forums.zeroc.com/discussion/46405/how-to-access-service-properties-using-icegridadmin-on-the-command-line-on-a-shared-communicator
Approved by: mentors (implicit)
Added:
head/devel/ice/files/patch-cpp-src-IceGrid-Parser.cpp (contents, props changed)
Modified:
head/devel/ice/Makefile
Modified: head/devel/ice/Makefile
==============================================================================
--- head/devel/ice/Makefile Sun Jul 10 12:39:29 2016 (r418314)
+++ head/devel/ice/Makefile Sun Jul 10 12:47:32 2016 (r418315)
@@ -3,6 +3,7 @@
PORTNAME= Ice
PORTVERSION= 3.6.2
+PORTREVISION= 1
DISTVERSIONPREFIX= v
CATEGORIES= devel
Added: head/devel/ice/files/patch-cpp-src-IceGrid-Parser.cpp
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/devel/ice/files/patch-cpp-src-IceGrid-Parser.cpp Sun Jul 10 12:47:32 2016 (r418315)
@@ -0,0 +1,27 @@
+--- cpp/src/IceGrid/Parser.cpp.orig 2016-05-16 22:49:28.132976967 +0200
++++ cpp/src/IceGrid/Parser.cpp 2016-05-16 23:15:17.589867966 +0200
+@@ -1912,10 +1912,24 @@
+ return;
+ }
+
++
+ Ice::ObjectPrx admin = _admin->getServerAdmin(server);
+ Ice::PropertiesAdminPrx propAdmin =
+ Ice::PropertiesAdminPrx::uncheckedCast(admin, "IceBox.Service." + service + ".Properties");
+
++ try
++ {
++ propAdmin->ice_ping();
++ }
++ catch(const Ice::ObjectNotExistException&)
++ {
++ Ice::PropertiesAdminPrx serverPropAdmin = Ice::PropertiesAdminPrx::uncheckedCast(admin, "Properties");
++ if (atoi(serverPropAdmin->getProperty("IceBox.UseSharedCommunicator." + service).c_str()))
++ {
++ propAdmin = Ice::PropertiesAdminPrx::uncheckedCast(admin, "IceBox.SharedCommunicator.Properties");
++ }
++ }
++
+ if(single)
+ {
+ string val = propAdmin->getProperty(property);
More information about the svn-ports-all
mailing list