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 /ruby/src/IceRuby/Endpoint.cpp | |
| 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 'ruby/src/IceRuby/Endpoint.cpp')
| -rw-r--r-- | ruby/src/IceRuby/Endpoint.cpp | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/ruby/src/IceRuby/Endpoint.cpp b/ruby/src/IceRuby/Endpoint.cpp index 746f87c7ba0..c6f8d8565e3 100644 --- a/ruby/src/IceRuby/Endpoint.cpp +++ b/ruby/src/IceRuby/Endpoint.cpp @@ -130,7 +130,17 @@ VALUE IceRuby::createEndpointInfo(const Ice::EndpointInfoPtr& p) { VALUE info; - if(Ice::TCPEndpointInfoPtr::dynamicCast(p)) + if(Ice::WSEndpointInfoPtr::dynamicCast(p)) + { + info = Data_Wrap_Struct(_wsEndpointInfoClass, 0, IceRuby_EndpointInfo_free, new Ice::EndpointInfoPtr(p)); + + Ice::WSEndpointInfoPtr ws = Ice::WSEndpointInfoPtr::dynamicCast(p); + rb_ivar_set(info, rb_intern("@host"), createString(ws->host)); + rb_ivar_set(info, rb_intern("@port"), INT2FIX(ws->port)); + rb_ivar_set(info, rb_intern("@sourceAddress"), createString(ws->sourceAddress)); + rb_ivar_set(info, rb_intern("@resource"), createString(ws->resource)); + } + else if(Ice::TCPEndpointInfoPtr::dynamicCast(p)) { info = Data_Wrap_Struct(_tcpEndpointInfoClass, 0, IceRuby_EndpointInfo_free, new Ice::EndpointInfoPtr(p)); @@ -150,16 +160,6 @@ IceRuby::createEndpointInfo(const Ice::EndpointInfoPtr& p) rb_ivar_set(info, rb_intern("@mcastInterface"), createString(udp->mcastInterface)); rb_ivar_set(info, rb_intern("@mcastTtl"), INT2FIX(udp->mcastTtl)); } - else if(Ice::WSEndpointInfoPtr::dynamicCast(p)) - { - info = Data_Wrap_Struct(_wsEndpointInfoClass, 0, IceRuby_EndpointInfo_free, new Ice::EndpointInfoPtr(p)); - - Ice::WSEndpointInfoPtr ws = Ice::WSEndpointInfoPtr::dynamicCast(p); - rb_ivar_set(info, rb_intern("@host"), createString(ws->host)); - rb_ivar_set(info, rb_intern("@port"), INT2FIX(ws->port)); - rb_ivar_set(info, rb_intern("@sourceAddress"), createString(ws->sourceAddress)); - rb_ivar_set(info, rb_intern("@resource"), createString(ws->resource)); - } else if(Ice::OpaqueEndpointInfoPtr::dynamicCast(p)) { info = Data_Wrap_Struct(_opaqueEndpointInfoClass, 0, IceRuby_EndpointInfo_free, new Ice::EndpointInfoPtr(p)); |