diff options
Diffstat (limited to 'java/src')
23 files changed, 81 insertions, 81 deletions
diff --git a/java/src/Freeze/Application.java b/java/src/Freeze/Application.java index 447b068268d..0cdf012a751 100644 --- a/java/src/Freeze/Application.java +++ b/java/src/Freeze/Application.java @@ -34,7 +34,7 @@ public abstract class Application extends Ice.Application System.err.println(appName() + ": " + ex + ": " + ex.message); status = 1; } - catch(Ice.RuntimeException ex) + catch(Ice.LocalException ex) { System.err.println(appName() + ": " + ex); ex.printStackTrace(); diff --git a/java/src/Ice/Application.java b/java/src/Ice/Application.java index 19d23c10e4f..faa1c836b7c 100644 --- a/java/src/Ice/Application.java +++ b/java/src/Ice/Application.java @@ -60,7 +60,7 @@ public abstract class Application } status = run(argHolder.value); } - catch(RuntimeException ex) + catch(LocalException ex) { System.err.println(_appName + ": " + ex); ex.printStackTrace(); @@ -79,7 +79,7 @@ public abstract class Application { _communicator.destroy(); } - catch(RuntimeException ex) + catch(LocalException ex) { System.err.println(_appName + ": " + ex); ex.printStackTrace(); diff --git a/java/src/Ice/RuntimeException.java b/java/src/Ice/LocalException.java index bf1fecfed00..9e1f547efda 100644 --- a/java/src/Ice/RuntimeException.java +++ b/java/src/Ice/LocalException.java @@ -10,7 +10,7 @@ package Ice; -public abstract class RuntimeException extends java.lang.RuntimeException +public abstract class LocalException extends RuntimeException { public abstract String ice_name(); diff --git a/java/src/Ice/LocationForward.java b/java/src/Ice/LocationForward.java index 66713da5d8b..d55d6966368 100644 --- a/java/src/Ice/LocationForward.java +++ b/java/src/Ice/LocationForward.java @@ -14,7 +14,7 @@ package Ice; // LocationForward must be an unchecked exception, because it can // be thrown from any servant operation // -public class LocationForward extends java.lang.RuntimeException +public class LocationForward extends RuntimeException { public LocationForward(ObjectPrx prx) diff --git a/java/src/Ice/ObjectAdapterI.java b/java/src/Ice/ObjectAdapterI.java index 7de76f3769f..a7ee31930de 100644 --- a/java/src/Ice/ObjectAdapterI.java +++ b/java/src/Ice/ObjectAdapterI.java @@ -439,7 +439,7 @@ public class ObjectAdapterI extends LocalObjectImpl implements ObjectAdapter beg = end + 1; } } - catch(RuntimeException ex) + catch(LocalException ex) { deactivate(); throw ex; diff --git a/java/src/Ice/ObjectPrxHelper.java b/java/src/Ice/ObjectPrxHelper.java index b0b1ab40f41..1d9c733c64e 100644 --- a/java/src/Ice/ObjectPrxHelper.java +++ b/java/src/Ice/ObjectPrxHelper.java @@ -49,7 +49,7 @@ public class ObjectPrxHelper implements ObjectPrx { __cnt = __handleException(__ex.get(), __cnt); } - catch(RuntimeException __ex) + catch(LocalException __ex) { __cnt = __handleException(__ex, __cnt); } @@ -82,7 +82,7 @@ public class ObjectPrxHelper implements ObjectPrx { __cnt = __handleException(__ex.get(), __cnt); } - catch(RuntimeException __ex) + catch(LocalException __ex) { __cnt = __handleException(__ex, __cnt); } @@ -114,7 +114,7 @@ public class ObjectPrxHelper implements ObjectPrx { __cnt = __handleException(__ex.get(), __cnt); } - catch(RuntimeException __ex) + catch(LocalException __ex) { __cnt = __handleException(__ex, __cnt); } @@ -146,7 +146,7 @@ public class ObjectPrxHelper implements ObjectPrx { __cnt = __handleException(__ex.get(), __cnt); } - catch(RuntimeException __ex) + catch(LocalException __ex) { __cnt = __handleException(__ex, __cnt); } @@ -178,7 +178,7 @@ public class ObjectPrxHelper implements ObjectPrx { __cnt = __handleException(__ex.get(), __cnt); } - catch(RuntimeException __ex) + catch(LocalException __ex) { __cnt = __handleException(__ex, __cnt); } @@ -218,7 +218,7 @@ public class ObjectPrxHelper implements ObjectPrx __rethrowException(__ex.get()); } } - catch(RuntimeException __ex) + catch(LocalException __ex) { __cnt = __handleException(__ex, __cnt); } @@ -507,7 +507,7 @@ public class ObjectPrxHelper implements ObjectPrx } public final int - __handleException(RuntimeException ex, int cnt) + __handleException(LocalException ex, int cnt) { // // Only _delegate needs to be mutex protected here. @@ -582,7 +582,7 @@ public class ObjectPrxHelper implements ObjectPrx } public final synchronized void - __rethrowException(RuntimeException ex) + __rethrowException(LocalException ex) { _delegate = null; diff --git a/java/src/Ice/_ObjectDelD.java b/java/src/Ice/_ObjectDelD.java index 94059176205..390c6e70bdb 100644 --- a/java/src/Ice/_ObjectDelD.java +++ b/java/src/Ice/_ObjectDelD.java @@ -27,13 +27,13 @@ public class _ObjectDelD implements _ObjectDel { return __direct.facetServant().ice_isA(__id, __current); } - catch(RuntimeException ex) + catch(LocalException ex) { - UnknownRuntimeException e = new UnknownRuntimeException(); + UnknownLocalException e = new UnknownLocalException(); e.initCause(ex); throw e; } - catch(java.lang.RuntimeException ex) + catch(RuntimeException ex) { UnknownException e = new UnknownException(); e.initCause(ex); @@ -63,13 +63,13 @@ public class _ObjectDelD implements _ObjectDel __direct.facetServant().ice_ping(__current); return; } - catch(RuntimeException ex) + catch(LocalException ex) { - UnknownRuntimeException e = new UnknownRuntimeException(); + UnknownLocalException e = new UnknownLocalException(); e.initCause(ex); throw e; } - catch(java.lang.RuntimeException ex) + catch(RuntimeException ex) { UnknownException e = new UnknownException(); e.initCause(ex); @@ -98,13 +98,13 @@ public class _ObjectDelD implements _ObjectDel { return __direct.facetServant().ice_ids(__current); } - catch(RuntimeException ex) + catch(LocalException ex) { - UnknownRuntimeException e = new UnknownRuntimeException(); + UnknownLocalException e = new UnknownLocalException(); e.initCause(ex); throw e; } - catch(java.lang.RuntimeException ex) + catch(RuntimeException ex) { UnknownException e = new UnknownException(); e.initCause(ex); @@ -133,13 +133,13 @@ public class _ObjectDelD implements _ObjectDel { return __direct.facetServant().ice_id(__current); } - catch(RuntimeException ex) + catch(LocalException ex) { - UnknownRuntimeException e = new UnknownRuntimeException(); + UnknownLocalException e = new UnknownLocalException(); e.initCause(ex); throw e; } - catch(java.lang.RuntimeException ex) + catch(RuntimeException ex) { UnknownException e = new UnknownException(); e.initCause(ex); @@ -168,13 +168,13 @@ public class _ObjectDelD implements _ObjectDel { return __direct.facetServant().ice_facets(__current); } - catch(RuntimeException ex) + catch(LocalException ex) { - UnknownRuntimeException e = new UnknownRuntimeException(); + UnknownLocalException e = new UnknownLocalException(); e.initCause(ex); throw e; } - catch(java.lang.RuntimeException ex) + catch(RuntimeException ex) { UnknownException e = new UnknownException(); e.initCause(ex); @@ -215,13 +215,13 @@ public class _ObjectDelD implements _ObjectDel { return __servant.ice_invoke(inParams, outParams, current); } - catch(RuntimeException ex) + catch(LocalException ex) { - UnknownRuntimeException e = new UnknownRuntimeException(); + UnknownLocalException e = new UnknownLocalException(); e.initCause(ex); throw e; } - catch(java.lang.RuntimeException ex) + catch(RuntimeException ex) { UnknownException e = new UnknownException(); e.initCause(ex); diff --git a/java/src/Ice/_ObjectDelM.java b/java/src/Ice/_ObjectDelM.java index 9f1fb529bbb..443b39bcd3d 100644 --- a/java/src/Ice/_ObjectDelM.java +++ b/java/src/Ice/_ObjectDelM.java @@ -252,7 +252,7 @@ public class _ObjectDelM implements _ObjectDel assert(__connection != null); __connection.incProxyUsageCount(); } - catch (RuntimeException ex) + catch (LocalException ex) { if(__reference.routerInfo == null && __reference.endpoints.length == 0) { diff --git a/java/src/IceBox/ServiceManagerI.java b/java/src/IceBox/ServiceManagerI.java index 3234b1813b9..055bd1c563c 100644 --- a/java/src/IceBox/ServiceManagerI.java +++ b/java/src/IceBox/ServiceManagerI.java @@ -131,7 +131,7 @@ public final class ServiceManagerI extends _ServiceManagerDisp stopAll(); return 1; } - catch(Ice.RuntimeException ex) + catch(Ice.LocalException ex) { java.io.StringWriter sw = new java.io.StringWriter(); java.io.PrintWriter pw = new java.io.PrintWriter(sw); diff --git a/java/src/IceInternal/Connection.java b/java/src/IceInternal/Connection.java index 0cf722ac830..ec025e0ffc5 100644 --- a/java/src/IceInternal/Connection.java +++ b/java/src/IceInternal/Connection.java @@ -141,7 +141,7 @@ public final class Connection extends EventHandler TraceUtil.traceRequest("sending request", os, _logger, _traceLevels); _transceiver.write(os, _endpoint.timeout()); } - catch(Ice.RuntimeException ex) + catch(Ice.LocalException ex) { setState(StateClosed, ex); assert(_exception != null); @@ -255,7 +255,7 @@ public final class Connection extends EventHandler _batchStream.destroy(); _batchStream = new BasicStream(_instance); } - catch(Ice.RuntimeException ex) + catch(Ice.LocalException ex) { setState(StateClosed, ex); assert(_exception != null); @@ -497,7 +497,7 @@ public final class Connection extends EventHandler } } } - catch(Ice.RuntimeException ex) + catch(Ice.LocalException ex) { setState(StateClosed, ex); return; @@ -542,7 +542,7 @@ public final class Connection extends EventHandler { in.invoke(response); } - catch(Ice.RuntimeException ex) + catch(Ice.LocalException ex) { _mutex.lock(); reclaimIncoming(in); @@ -579,7 +579,7 @@ public final class Connection extends EventHandler } while(batch && is.pos() < is.size()); } - catch(Ice.RuntimeException ex) + catch(Ice.LocalException ex) { _mutex.lock(); reclaimIncoming(in); @@ -624,7 +624,7 @@ public final class Connection extends EventHandler closeConnection(); } } - catch(Ice.RuntimeException ex) + catch(Ice.LocalException ex) { setState(StateClosed, ex); return; @@ -677,7 +677,7 @@ public final class Connection extends EventHandler } public void - exception(Ice.RuntimeException ex) + exception(Ice.LocalException ex) { _mutex.lock(); try @@ -730,7 +730,7 @@ public final class Connection extends EventHandler { validateConnection(); } - catch(Ice.RuntimeException ex) + catch(Ice.LocalException ex) { if(_warn) { @@ -809,7 +809,7 @@ public final class Connection extends EventHandler private static final int StateClosed = 3; private void - setState(int state, Ice.RuntimeException ex) + setState(int state, Ice.LocalException ex) { if(_state == state) // Don't switch twice. { @@ -948,7 +948,7 @@ public final class Connection extends EventHandler { closeConnection(); } - catch(Ice.RuntimeException ex) + catch(Ice.LocalException ex) { setState(StateClosed, ex); } @@ -1087,7 +1087,7 @@ public final class Connection extends EventHandler private final boolean _warn; private int _nextRequestId; private IntMap _requests = new IntMap(); - private Ice.RuntimeException _exception; + private Ice.LocalException _exception; private BasicStream _batchStream; private int _responseCount; private int _proxyUsageCount; diff --git a/java/src/IceInternal/DispatchStatus.java b/java/src/IceInternal/DispatchStatus.java index 3967bec1c81..e50a3211609 100644 --- a/java/src/IceInternal/DispatchStatus.java +++ b/java/src/IceInternal/DispatchStatus.java @@ -27,8 +27,8 @@ public final class DispatchStatus public static final DispatchStatus DispatchFacetNotExist = new DispatchStatus(_DispatchFacetNotExist); public static final int _DispatchOperationNotExist = 5; public static final DispatchStatus DispatchOperationNotExist = new DispatchStatus(_DispatchOperationNotExist); - public static final int _DispatchUnknownRuntimeException = 6; - public static final DispatchStatus DispatchUnknownRuntimeException = new DispatchStatus(_DispatchUnknownRuntimeException); + public static final int _DispatchUnknownLocalException = 6; + public static final DispatchStatus DispatchUnknownLocalException = new DispatchStatus(_DispatchUnknownLocalException); public static final int _DispatchUnknownUserException = 7; public static final DispatchStatus DispatchUnknownUserException = new DispatchStatus(_DispatchUnknownUserException); public static final int _DispatchUnknownException = 8; diff --git a/java/src/IceInternal/EventHandler.java b/java/src/IceInternal/EventHandler.java index c088df1dc30..09d937c8e7c 100644 --- a/java/src/IceInternal/EventHandler.java +++ b/java/src/IceInternal/EventHandler.java @@ -38,7 +38,7 @@ abstract class EventHandler // // Propagate an exception to the event handler. // - abstract public void exception(Ice.RuntimeException ex); + abstract public void exception(Ice.LocalException ex); // // Get a textual representation of the event handler. diff --git a/java/src/IceInternal/Incoming.java b/java/src/IceInternal/Incoming.java index 0e9ffb03878..05682f38d46 100644 --- a/java/src/IceInternal/Incoming.java +++ b/java/src/IceInternal/Incoming.java @@ -236,7 +236,7 @@ public class Incoming // Rethrow, so that the caller can print a warning. throw ex; } - catch(Ice.RuntimeException ex) + catch(Ice.LocalException ex) { if(locator != null && servant != null) { @@ -250,7 +250,7 @@ public class Incoming _os.endWriteEncaps(); _os.resize(statusPos, false); _os.writeByte( - (byte)DispatchStatus._DispatchUnknownRuntimeException); + (byte)DispatchStatus._DispatchUnknownLocalException); } // Rethrow, so that the caller can print a warning. diff --git a/java/src/IceInternal/IncomingConnectionFactory.java b/java/src/IceInternal/IncomingConnectionFactory.java index 631e47d9b5f..21b7fb9026f 100644 --- a/java/src/IceInternal/IncomingConnectionFactory.java +++ b/java/src/IceInternal/IncomingConnectionFactory.java @@ -116,7 +116,7 @@ public class IncomingConnectionFactory extends EventHandler // Ignore timeouts. return; } - catch(Ice.RuntimeException ex) + catch(Ice.LocalException ex) { if(_warn) { @@ -136,7 +136,7 @@ public class IncomingConnectionFactory extends EventHandler connection.activate(); _connections.add(connection); } - catch(Ice.RuntimeException ex) + catch(Ice.LocalException ex) { // // Ignore all exceptions while creating or activating the @@ -172,7 +172,7 @@ public class IncomingConnectionFactory extends EventHandler } public void - exception(Ice.RuntimeException ex) + exception(Ice.LocalException ex) { assert(false); // Must not be called. } @@ -384,7 +384,7 @@ public class IncomingConnectionFactory extends EventHandler } private void - warning(Ice.RuntimeException ex) + warning(Ice.LocalException ex) { java.io.StringWriter sw = new java.io.StringWriter(); java.io.PrintWriter pw = new java.io.PrintWriter(sw); diff --git a/java/src/IceInternal/Instance.java b/java/src/IceInternal/Instance.java index cbbf523763c..1e61d5e38f1 100644 --- a/java/src/IceInternal/Instance.java +++ b/java/src/IceInternal/Instance.java @@ -188,7 +188,7 @@ public class Instance _bufferManager = new BufferManager(); // Must be created before the ThreadPool } - catch(Ice.RuntimeException ex) + catch(Ice.LocalException ex) { destroy(); throw ex; diff --git a/java/src/IceInternal/LocatorInfo.java b/java/src/IceInternal/LocatorInfo.java index 017274eb3f5..a9c8f81e157 100644 --- a/java/src/IceInternal/LocatorInfo.java +++ b/java/src/IceInternal/LocatorInfo.java @@ -88,7 +88,7 @@ public final class LocatorInfo endpoints = ((Ice.ObjectPrxHelper)object).__reference().endpoints; } } - catch(Ice.RuntimeException ex) + catch(Ice.LocalException ex) { // // Just trace the failure. The proxy will most diff --git a/java/src/IceInternal/Network.java b/java/src/IceInternal/Network.java index 7fb0981252e..402e8c4fc53 100644 --- a/java/src/IceInternal/Network.java +++ b/java/src/IceInternal/Network.java @@ -436,7 +436,7 @@ public final class Network doConnect(sink, addr, -1); fds.source = doAccept(fd, -1); } - catch(Ice.RuntimeException ex) + catch(Ice.LocalException ex) { try { diff --git a/java/src/IceInternal/NonRepeatable.java b/java/src/IceInternal/NonRepeatable.java index 64e04b1060a..f1963b4eb80 100644 --- a/java/src/IceInternal/NonRepeatable.java +++ b/java/src/IceInternal/NonRepeatable.java @@ -13,16 +13,16 @@ package IceInternal; public class NonRepeatable extends Exception { public - NonRepeatable(Ice.RuntimeException ex) + NonRepeatable(Ice.LocalException ex) { _ex = ex; } - public Ice.RuntimeException + public Ice.LocalException get() { return _ex; } - private Ice.RuntimeException _ex; + private Ice.LocalException _ex; } diff --git a/java/src/IceInternal/Outgoing.java b/java/src/IceInternal/Outgoing.java index 8ea8d41fe11..be522da8b84 100644 --- a/java/src/IceInternal/Outgoing.java +++ b/java/src/IceInternal/Outgoing.java @@ -80,7 +80,7 @@ public final class Outgoing if(_state == StateInProgress) { timedOut = true; - _state = StateRuntimeException; + _state = StateLocalException; _exception = new Ice.TimeoutException(); } } @@ -221,7 +221,7 @@ public final class Outgoing case DispatchStatus._DispatchObjectNotExist: { - _state = StateRuntimeException; + _state = StateLocalException; Ice.ObjectNotExistException ex = new Ice.ObjectNotExistException(); ex.id = new Ice.Identity(); ex.id.__read(_is); @@ -232,7 +232,7 @@ public final class Outgoing case DispatchStatus._DispatchFacetNotExist: { - _state = StateRuntimeException; + _state = StateLocalException; Ice.FacetNotExistException ex = new Ice.FacetNotExistException(); ex.facet = _is.readStringSeq(); _exception = ex; @@ -242,7 +242,7 @@ public final class Outgoing case DispatchStatus._DispatchOperationNotExist: { - _state = StateRuntimeException; + _state = StateLocalException; Ice.OperationNotExistException ex = new Ice.OperationNotExistException(); ex.operation = _is.readString(); _exception = ex; @@ -250,17 +250,17 @@ public final class Outgoing break; } - case DispatchStatus._DispatchUnknownRuntimeException: + case DispatchStatus._DispatchUnknownLocalException: { - _state = StateRuntimeException; - _exception = new Ice.UnknownRuntimeException(); + _state = StateLocalException; + _exception = new Ice.UnknownLocalException(); _fillStackTrace = true; break; } case DispatchStatus._DispatchUnknownUserException: { - _state = StateRuntimeException; + _state = StateLocalException; _exception = new Ice.UnknownUserException(); _fillStackTrace = true; break; @@ -268,7 +268,7 @@ public final class Outgoing case DispatchStatus._DispatchUnknownException: { - _state = StateRuntimeException; + _state = StateLocalException; _exception = new Ice.UnknownException(); _fillStackTrace = true; break; @@ -276,7 +276,7 @@ public final class Outgoing default: { - _state = StateRuntimeException; + _state = StateLocalException; _exception = new Ice.UnknownReplyStatusException(); _fillStackTrace = true; break; @@ -287,11 +287,11 @@ public final class Outgoing } public synchronized void - finished(Ice.RuntimeException ex) + finished(Ice.LocalException ex) { if(_state == StateInProgress) { - _state = StateRuntimeException; + _state = StateLocalException; _exception = ex; notify(); } @@ -364,7 +364,7 @@ public final class Outgoing private Connection _connection; private Reference _reference; - private Ice.RuntimeException _exception; + private Ice.LocalException _exception; private boolean _fillStackTrace; private static final int StateUnsent = 0; @@ -372,7 +372,7 @@ public final class Outgoing private static final int StateOK = 2; private static final int StateLocationForward = 3; private static final int StateUserException = 4; - private static final int StateRuntimeException = 5; + private static final int StateLocalException = 5; private int _state; private BasicStream _is; diff --git a/java/src/IceInternal/OutgoingConnectionFactory.java b/java/src/IceInternal/OutgoingConnectionFactory.java index a1f58bc58a3..1a743ade447 100644 --- a/java/src/IceInternal/OutgoingConnectionFactory.java +++ b/java/src/IceInternal/OutgoingConnectionFactory.java @@ -61,7 +61,7 @@ public class OutgoingConnectionFactory Ice.Logger logger = _instance.logger(); Connection connection = null; - Ice.RuntimeException exception = null; + Ice.LocalException exception = null; for(int i = 0; i < endpoints.length; i++) { Endpoint endpoint = endpoints[i]; diff --git a/java/src/IceInternal/ThreadPool.java b/java/src/IceInternal/ThreadPool.java index a04ca12887c..8354cff247c 100644 --- a/java/src/IceInternal/ThreadPool.java +++ b/java/src/IceInternal/ThreadPool.java @@ -591,7 +591,7 @@ public final class ThreadPool { handler.finished(this); } - catch(Ice.RuntimeException ex) + catch(Ice.LocalException ex) { java.io.StringWriter sw = new java.io.StringWriter(); java.io.PrintWriter pw = new java.io.PrintWriter(sw); @@ -627,7 +627,7 @@ public final class ThreadPool { continue repeatSelect; } - catch(Ice.RuntimeException ex) + catch(Ice.LocalException ex) { if(TRACE_EXCEPTION) { @@ -898,7 +898,7 @@ public final class ThreadPool { ThreadPool.this.run(stream); } - catch(Ice.RuntimeException ex) + catch(Ice.LocalException ex) { java.io.StringWriter sw = new java.io.StringWriter(); java.io.PrintWriter pw = new java.io.PrintWriter(sw); diff --git a/java/src/IceInternal/TraceUtil.java b/java/src/IceInternal/TraceUtil.java index b58522dfe85..4ebb46a776c 100644 --- a/java/src/IceInternal/TraceUtil.java +++ b/java/src/IceInternal/TraceUtil.java @@ -118,7 +118,7 @@ final class TraceUtil s.write("(operation not exist)"); break; } - case DispatchStatus._DispatchUnknownRuntimeException: + case DispatchStatus._DispatchUnknownLocalException: { s.write("(unknown local exception)"); break; diff --git a/java/src/IceInternal/UdpTransceiver.java b/java/src/IceInternal/UdpTransceiver.java index 5c9db40cb54..201e814fade 100644 --- a/java/src/IceInternal/UdpTransceiver.java +++ b/java/src/IceInternal/UdpTransceiver.java @@ -201,7 +201,7 @@ final class UdpTransceiver implements Transceiver _logger.trace(_traceLevels.networkCat, s); } } - catch(Ice.RuntimeException ex) + catch(Ice.LocalException ex) { _fd = null; throw ex; @@ -231,7 +231,7 @@ final class UdpTransceiver implements Transceiver _logger.trace(_traceLevels.networkCat, s); } } - catch(Ice.RuntimeException ex) + catch(Ice.LocalException ex) { _fd = null; throw ex; |