ICE-4862 - checkedCast raises FacetNotExistException

1 files changed, 21 insertions, 13 deletions

diff --git a/rb/src/IceRuby/Proxy.cpp b/rb/src/IceRuby/Proxy.cpp
index 96821876a6e..2452cd12506 100644
--- a/rb/src/IceRuby/Proxy.cpp
+++ b/rb/src/IceRuby/Proxy.cpp
@@ -12,6 +12,7 @@
 #include <Connection.h>
 #include <Endpoint.h>
 #include <Util.h>
+#include <Ice/LocalException.h>
 #include <Ice/Locator.h>
 #include <Ice/Proxy.h>
 #include <Ice/Router.h>
@@ -956,27 +957,34 @@ checkedCastImpl(const Ice::ObjectPrx& p, const string& id, VALUE facet, VALUE ct
         target = p->ice_facet(getString(facet));
     }
 
-    if(NIL_P(ctx))
+    try
     {
-        if(target->ice_isA(id))
+        if(NIL_P(ctx))
         {
-            return createProxy(target, type);
+            if(target->ice_isA(id))
+            {
+                return createProxy(target, type);
+            }
         }
-    }
-    else
-    {
-        Ice::Context c;
+        else
+        {
+            Ice::Context c;
 #ifndef NDEBUG
-        bool b =
+            bool b =
 #endif
-        hashToContext(ctx, c);
-        assert(b);
+            hashToContext(ctx, c);
+            assert(b);
 
-        if(target->ice_isA(id, c))
-        {
-            return createProxy(target, type);
+            if(target->ice_isA(id, c))
+            {
+                return createProxy(target, type);
+            }
         }
     }
+    catch(const Ice::FacetNotExistException&)
+    {
+        // Ignore.
+    }
 
     return Qnil;
 }