diff options
| author | Dwayne Boone <dwayne@zeroc.com> | 2015-05-05 12:04:18 -0230 |
|---|---|---|
| committer | Dwayne Boone <dwayne@zeroc.com> | 2015-05-05 12:04:18 -0230 |
| commit | 77beda421aa4cbe82b1bf7b7000ed456c0f16437 (patch) | |
| tree | 33fab63f3196bbcebedb0dd6299c52ed68a7f7d7 /php/src | |
| parent | fixing gradle test dependency (diff) | |
| download | ice-77beda421aa4cbe82b1bf7b7000ed456c0f16437.tar.bz2 ice-77beda421aa4cbe82b1bf7b7000ed456c0f16437.tar.xz ice-77beda421aa4cbe82b1bf7b7000ed456c0f16437.zip | |
ICE-6479 info test failures with scripting languages
Diffstat (limited to 'php/src')
| -rw-r--r-- | php/src/IcePHP/Connection.cpp | 28 | ||||
| -rw-r--r-- | php/src/IcePHP/Endpoint.cpp | 18 |
2 files changed, 23 insertions, 23 deletions
diff --git a/php/src/IcePHP/Connection.cpp b/php/src/IcePHP/Connection.cpp index e04d7123ea6..b664cd9fac5 100644 --- a/php/src/IcePHP/Connection.cpp +++ b/php/src/IcePHP/Connection.cpp @@ -620,20 +620,7 @@ bool IcePHP::createConnectionInfo(zval* zv, const Ice::ConnectionInfoPtr& p TSRMLS_DC) { int status; - if(Ice::TCPConnectionInfoPtr::dynamicCast(p)) - { - status = object_init_ex(zv, tcpConnectionInfoClassEntry); - } - else if(Ice::UDPConnectionInfoPtr::dynamicCast(p)) - { - Ice::UDPConnectionInfoPtr info = Ice::UDPConnectionInfoPtr::dynamicCast(p); - if((status = object_init_ex(zv, udpConnectionInfoClassEntry)) == SUCCESS) - { - add_property_string(zv, STRCAST("mcastAddress"), const_cast<char*>(info->mcastAddress.c_str()), 1); - add_property_long(zv, STRCAST("mcastPort"), static_cast<long>(info->mcastPort)); - } - } - else if(Ice::WSConnectionInfoPtr::dynamicCast(p)) + if(Ice::WSConnectionInfoPtr::dynamicCast(p)) { Ice::WSConnectionInfoPtr info = Ice::WSConnectionInfoPtr::dynamicCast(p); if((status = object_init_ex(zv, wsConnectionInfoClassEntry)) == SUCCESS) @@ -651,6 +638,19 @@ IcePHP::createConnectionInfo(zval* zv, const Ice::ConnectionInfoPtr& p TSRMLS_DC } } } + else if(Ice::TCPConnectionInfoPtr::dynamicCast(p)) + { + status = object_init_ex(zv, tcpConnectionInfoClassEntry); + } + else if(Ice::UDPConnectionInfoPtr::dynamicCast(p)) + { + Ice::UDPConnectionInfoPtr info = Ice::UDPConnectionInfoPtr::dynamicCast(p); + if((status = object_init_ex(zv, udpConnectionInfoClassEntry)) == SUCCESS) + { + add_property_string(zv, STRCAST("mcastAddress"), const_cast<char*>(info->mcastAddress.c_str()), 1); + add_property_long(zv, STRCAST("mcastPort"), static_cast<long>(info->mcastPort)); + } + } else if(Ice::IPConnectionInfoPtr::dynamicCast(p)) { status = object_init_ex(zv, ipConnectionInfoClassEntry); diff --git a/php/src/IcePHP/Endpoint.cpp b/php/src/IcePHP/Endpoint.cpp index 39303b190be..317dcb6c3d8 100644 --- a/php/src/IcePHP/Endpoint.cpp +++ b/php/src/IcePHP/Endpoint.cpp @@ -428,7 +428,15 @@ bool IcePHP::createEndpointInfo(zval* zv, const Ice::EndpointInfoPtr& p TSRMLS_DC) { int status; - if(Ice::TCPEndpointInfoPtr::dynamicCast(p)) + if(Ice::WSEndpointInfoPtr::dynamicCast(p)) + { + Ice::WSEndpointInfoPtr info = Ice::WSEndpointInfoPtr::dynamicCast(p); + if((status = object_init_ex(zv, wsEndpointInfoClassEntry)) == SUCCESS) + { + add_property_string(zv, STRCAST("resource"), const_cast<char*>(info->resource.c_str()), 1); + } + } + else if(Ice::TCPEndpointInfoPtr::dynamicCast(p)) { status = object_init_ex(zv, tcpEndpointInfoClassEntry); } @@ -441,14 +449,6 @@ IcePHP::createEndpointInfo(zval* zv, const Ice::EndpointInfoPtr& p TSRMLS_DC) add_property_long(zv, STRCAST("mcastTtl"), static_cast<long>(info->mcastTtl)); } } - else if(Ice::WSEndpointInfoPtr::dynamicCast(p)) - { - Ice::WSEndpointInfoPtr info = Ice::WSEndpointInfoPtr::dynamicCast(p); - if((status = object_init_ex(zv, wsEndpointInfoClassEntry)) == SUCCESS) - { - add_property_string(zv, STRCAST("resource"), const_cast<char*>(info->resource.c_str()), 1); - } - } else if(Ice::OpaqueEndpointInfoPtr::dynamicCast(p)) { Ice::OpaqueEndpointInfoPtr info = Ice::OpaqueEndpointInfoPtr::dynamicCast(p); |