diff options
| author | Marc Laukien <marc@zeroc.com> | 2002-11-27 21:54:20 +0000 |
|---|---|---|
| committer | Marc Laukien <marc@zeroc.com> | 2002-11-27 21:54:20 +0000 |
| commit | 8042456879b8fde8683df20274e7dc887a1e6737 (patch) | |
| tree | f8ef3dc13589e6610e5473d5e5319125af2ee754 /java/src/Ice/ObjectPrxHelper.java | |
| parent | added ami (diff) | |
| download | ice-8042456879b8fde8683df20274e7dc887a1e6737.tar.bz2 ice-8042456879b8fde8683df20274e7dc887a1e6737.tar.xz ice-8042456879b8fde8683df20274e7dc887a1e6737.zip | |
various changes
Diffstat (limited to 'java/src/Ice/ObjectPrxHelper.java')
| -rw-r--r-- | java/src/Ice/ObjectPrxHelper.java | 56 |
1 files changed, 0 insertions, 56 deletions
diff --git a/java/src/Ice/ObjectPrxHelper.java b/java/src/Ice/ObjectPrxHelper.java index 840463753f2..bc5c6196c72 100644 --- a/java/src/Ice/ObjectPrxHelper.java +++ b/java/src/Ice/ObjectPrxHelper.java @@ -45,10 +45,6 @@ public class ObjectPrxHelper implements ObjectPrx _ObjectDel __del = __getDelegate(); return __del.ice_isA(__id, __context); } - catch(LocationForward __ex) - { - __locationForward(__ex); - } catch(IceInternal.NonRepeatable __ex) { __cnt = __handleException(__ex.get(), __cnt); @@ -78,10 +74,6 @@ public class ObjectPrxHelper implements ObjectPrx __del.ice_ping(__context); return; } - catch(LocationForward __ex) - { - __locationForward(__ex); - } catch(IceInternal.NonRepeatable __ex) { __cnt = __handleException(__ex.get(), __cnt); @@ -110,10 +102,6 @@ public class ObjectPrxHelper implements ObjectPrx _ObjectDel __del = __getDelegate(); return __del.ice_ids(__context); } - catch(LocationForward __ex) - { - __locationForward(__ex); - } catch(IceInternal.NonRepeatable __ex) { __cnt = __handleException(__ex.get(), __cnt); @@ -142,10 +130,6 @@ public class ObjectPrxHelper implements ObjectPrx _ObjectDel __del = __getDelegate(); return __del.ice_id(__context); } - catch(LocationForward __ex) - { - __locationForward(__ex); - } catch(IceInternal.NonRepeatable __ex) { __cnt = __handleException(__ex.get(), __cnt); @@ -174,10 +158,6 @@ public class ObjectPrxHelper implements ObjectPrx _ObjectDel __del = __getDelegate(); return __del.ice_facets(__context); } - catch(LocationForward __ex) - { - __locationForward(__ex); - } catch(IceInternal.NonRepeatable __ex) { __cnt = __handleException(__ex.get(), __cnt); @@ -207,10 +187,6 @@ public class ObjectPrxHelper implements ObjectPrx _ObjectDel __del = __getDelegate(); return __del.ice_invoke(operation, mode, inParams, outParams, __context); } - catch(LocationForward __ex) - { - __locationForward(__ex); - } catch(IceInternal.NonRepeatable __ex) { if(mode == OperationMode.Nonmutating || mode == OperationMode.Idempotent) @@ -588,38 +564,6 @@ public class ObjectPrxHelper implements ObjectPrx throw ex; } - public final synchronized void - __locationForward(LocationForward ex) - { - _delegate = null; - - ObjectPrxHelper h = (ObjectPrxHelper)ex._prx; - if(!_reference.identity.equals(h.__reference().identity)) - { - throw new LocationForwardIdentityException(); - } - - // - // TODO: BENOIT: This is not thread-safe. Everywhere else in the - // code, _reference is considered immutable and is not mutex - // protected. - // - _reference = _reference.changeAdapterId(h.__reference().adapterId); - _reference = _reference.changeEndpoints(h.__reference().endpoints); - - /* - IceInternal.TraceLevels traceLevels = - _reference.instance.traceLevels(); - Logger logger = _reference.instance.logger(); - - if(traceLevels.locationForward >= 1) - { - String s = "location forward for object with identity `" + _reference.identity + "'"; - logger.trace(traceLevels.locationForwardCat, s); - } - */ - } - public final synchronized _ObjectDel __getDelegate() { |