Merged with R3_3_branch

1 files changed, 38 insertions, 0 deletions

diff --git a/java/src/IceGridGUI/SessionKeeper.java b/java/src/IceGridGUI/SessionKeeper.java
index 128ce1a7b80..5130b133c6d 100644
--- a/java/src/IceGridGUI/SessionKeeper.java
+++ b/java/src/IceGridGUI/SessionKeeper.java
@@ -99,6 +99,17 @@ class SessionKeeper
                 _serverAdminCategory = _admin.getServerAdminCategory();
 
             }
+            catch(Ice.OperationNotExistException e)
+            {
+                logout(true);
+                JOptionPane.showMessageDialog(
+                    parent,
+                    "This version of IceGrid Admin requires an IceGrid Registry version 3.3",
+                    "Login failed: Version Mismatch",
+                    JOptionPane.ERROR_MESSAGE);
+                throw e;
+
+            }
             catch(Ice.LocalException e)
             {
                 logout(true);
@@ -189,6 +200,27 @@ class SessionKeeper
             }
         }
 
+        Ice.ObjectPrx retrieveCallback(String name, String facet)
+        {
+            if(_adminCallbackCategory == null)
+            {
+                return null;
+            }
+            else
+            {
+                Ice.Identity ident = new Ice.Identity(name, _adminCallbackCategory);
+                if(_adapter.findFacet(ident, facet) == null)
+                {
+                    return null;
+                }
+                else
+                {
+                    return _adapter.createProxy(ident).ice_facet(facet);
+                }
+            }
+        }
+        
+
         Ice.Object removeCallback(String name, String facet)
         {
             if(_adminCallbackCategory == null)
@@ -1388,6 +1420,12 @@ class SessionKeeper
     {
         return _session == null ? null : _session.addCallback(servant, name, facet);
     }
+    
+    Ice.ObjectPrx retrieveCallback(String name, String facet)
+    {
+        return _session == null ? null : _session.retrieveCallback(name, facet);
+    }
+
 
     Ice.Object removeCallback(String name, String facet)
     {