diff options
| author | Mark Spruiell <mes@zeroc.com> | 2007-03-21 18:39:23 +0000 |
|---|---|---|
| committer | Mark Spruiell <mes@zeroc.com> | 2007-03-21 18:39:23 +0000 |
| commit | 9b63e59829618b54d03202298c6ad41c894939be (patch) | |
| tree | e4f149ba2049bb0151802117a9532e9ec54b6d27 | |
| parent | Added nmake support (diff) | |
| download | ice-9b63e59829618b54d03202298c6ad41c894939be.tar.bz2 ice-9b63e59829618b54d03202298c6ad41c894939be.tar.xz ice-9b63e59829618b54d03202298c6ad41c894939be.zip | |
fixing bug in propertyToProxy
| -rw-r--r-- | rb/CHANGES | 6 | ||||
| -rw-r--r-- | rb/src/IceRuby/Communicator.cpp | 10 |
2 files changed, 14 insertions, 2 deletions
diff --git a/rb/CHANGES b/rb/CHANGES index c36e05d70c7..46459dbc324 100644 --- a/rb/CHANGES +++ b/rb/CHANGES @@ -1,3 +1,9 @@ +Changes since version 3.2.0 +--------------------------- + +- Fixed bugs in stringToProxy and propertyToProxy that reported a + "NullHandleException". + Changes since version 3.1.1 --------------------------- diff --git a/rb/src/IceRuby/Communicator.cpp b/rb/src/IceRuby/Communicator.cpp index 7b0c56d04fb..a598ef26bb1 100644 --- a/rb/src/IceRuby/Communicator.cpp +++ b/rb/src/IceRuby/Communicator.cpp @@ -263,7 +263,10 @@ IceRuby_Communicator_stringToProxy(VALUE self, VALUE str) Ice::CommunicatorPtr p = getCommunicator(self); string s = getString(str); Ice::ObjectPrx proxy = p->stringToProxy(s); - return createProxy(proxy); + if(proxy) + { + return createProxy(proxy); + } } ICE_RUBY_CATCH return Qnil; @@ -301,7 +304,10 @@ IceRuby_Communicator_propertyToProxy(VALUE self, VALUE str) Ice::CommunicatorPtr p = getCommunicator(self); string s = getString(str); Ice::ObjectPrx proxy = p->propertyToProxy(s); - return createProxy(proxy); + if(proxy) + { + return createProxy(proxy); + } } ICE_RUBY_CATCH return Qnil; |