diff options
Diffstat (limited to 'cpp')
| -rw-r--r-- | cpp/slice/Ice/BuiltinSequences.ice | 2 | ||||
| -rw-r--r-- | cpp/slice/Ice/LocalException.ice | 285 | ||||
| -rw-r--r-- | cpp/slice/Ice/ObjectAdapter.ice | 2 |
3 files changed, 142 insertions, 147 deletions
diff --git a/cpp/slice/Ice/BuiltinSequences.ice b/cpp/slice/Ice/BuiltinSequences.ice index 4697356d7dc..455356b5679 100644 --- a/cpp/slice/Ice/BuiltinSequences.ice +++ b/cpp/slice/Ice/BuiltinSequences.ice @@ -42,7 +42,7 @@ sequence<string> StringSeq; /** A sequence of objects. **/ sequence<Object> ObjectSeq; -#endif /* ICEE */ +#endif /** A sequence of object proxies. **/ sequence<Object*> ObjectProxySeq; diff --git a/cpp/slice/Ice/LocalException.ice b/cpp/slice/Ice/LocalException.ice index f640253a70d..3172141a0de 100644 --- a/cpp/slice/Ice/LocalException.ice +++ b/cpp/slice/Ice/LocalException.ice @@ -31,10 +31,119 @@ local exception InitializationException **/ string reason; }; + +/** + * + * This exception indicates that a failure occurred while initializing + * a plug-in. + * + **/ +local exception PluginInitializationException +{ + /** + * + * The reason for the failure. + * + **/ + string reason; +}; + +/** + * + * This exception is raised if a feature is requested that is not + * supported with collocation optimization. + * + **/ +local exception CollocationOptimizationException +{ +}; #endif /** * + * This exception is raised if an attempt is made to register a + * servant, servant locator, facet, object factory, plug-in, object + * adapter, object, or user exception factory more than once for the + * same ID. + * + **/ +local exception AlreadyRegisteredException +{ + /** + * + * The kind of object that is registered already: "servant", + * "servant locator", "facet", "object factory", "plug-in", + * "object adapter", "object", or "user exception factory". + * + **/ + string kindOfObject; + + /** + * + * The id (or name) of the object that is registered already. + * + **/ + string id; +}; + +/** + * + * This exception is raised if an attempt is made to remove a servant, + * facet, object factory, plug-in, object adapter, object, or user + * exception factory that is not currently registered. + * + **/ +local exception NotRegisteredException +{ + /** + * + * The kind of object that could not be removed: "servant", + * "facet", "object factory", "plug-in", "object adapter", + * "object", or "user exception factory". + * + **/ + string kindOfObject; + + /** + * + * The id (or name) of the object that could not be removed. + * + **/ + string id; +}; + +/** + * + * This exception is raised if an attempt is made to invoke an + * operation with [ice_oneway], [ice_batchOneway], [ice_datagram], + * or [ice_batchDatagram] and the operation has a return value, + * out parameters, or an exception specification. + * + **/ +local exception TwowayOnlyException +{ + /** + * + * The name of the operation that was invoked. + * + **/ + string operation; +}; + +/** + * + * This exception is raised if [ice_clone] is called on + * a class that is derived from an abstract Slice class (that is, + * a class containing operations), and the derived class does not + * provide an implementation of the [ice_clone] operation (C++ only). + * + **/ +local exception CloneNotImplementedException +{ +}; + +/** + * * This exception is raised if an operation call on a server raises an * unknown exception. For example, for C++, this exception is raised * if the server throws a C++ exception that is not directly or @@ -591,18 +700,6 @@ local exception ForcedCloseConnectionException extends ProtocolException { }; -#ifndef ICEE -/** - * - * This exception is a specialization of [ProtocolException], - * indicating that a batch request has been aborted. - * - **/ -local exception AbortBatchRequestException extends ProtocolException -{ -}; -#endif - /** * * This exception is a specialization of [ProtocolException], @@ -628,6 +725,16 @@ local exception CompressionNotSupportedException extends ProtocolException #ifndef ICEE /** * + * This exception is a specialization of [ProtocolException], + * indicating that a batch request has been aborted. + * + **/ +local exception AbortBatchRequestException extends ProtocolException +{ +}; + +/** + * * This exception is a specialization of [ProtocolException] that is * raised if there is a problem with compressing or uncompressing * data. @@ -671,31 +778,6 @@ local exception MarshalException extends ProtocolException string reason; }; -#ifndef ICEE -/** - * - * This exception is a specialization of [MarshalException] that is - * raised if no suitable object factory was found during object - * unmarshaling. - * - * @see ObjectFactory - * @see Communicator::addObjectFactory - * @see Communicator::removeObjectFactory - * @see Communicator::findObjectFactory - * - **/ -local exception NoObjectFactoryException extends MarshalException -{ - /** - * - * The absolute Slice type name of the object for which we - * could not find a factory. - * - **/ - string type; -}; -#endif - /** * * This exception is a specialization of [MarshalException] that is @@ -726,150 +808,63 @@ local exception UnmarshalOutOfBoundsException extends MarshalException local exception IllegalIndirectionException extends MarshalException { }; -#endif - -/** - * - * This exception is a specialization of [MarshalException] that is - * raised if the system-specific memory limit is exceeded during - * marshaling or unmarshaling. - * - **/ -local exception MemoryLimitException extends MarshalException -{ -}; - -/** - * - * This exception is a specialization of [MarshalException], - * indicating a malformed data encapsulation. - * - **/ -local exception EncapsulationException extends MarshalException -{ -}; /** * * This exception is a specialization of [MarshalException] that is - * raised if a negative size (e.g., a negative sequence size) is - * received. - * - **/ -local exception NegativeSizeException extends MarshalException -{ -}; - -#ifndef ICEE -/** + * raised if no suitable object factory was found during object + * unmarshaling. * - * This exception indicates that a failure occurred while initializing - * a plug-in. + * @see ObjectFactory + * @see Communicator::addObjectFactory + * @see Communicator::removeObjectFactory + * @see Communicator::findObjectFactory * **/ -local exception PluginInitializationException +local exception NoObjectFactoryException extends MarshalException { /** * - * The reason for the failure. + * The absolute Slice type name of the object for which we + * could not find a factory. * **/ - string reason; -}; - -/** - * - * This exception is raised if a feature is requested that is not - * supported with collocation optimization. - * - **/ -local exception CollocationOptimizationException -{ + string type; }; #endif /** * - * This exception is raised if an attempt is made to register a - * servant, servant locator, facet, object factory, plug-in, object - * adapter, object, or user exception factory more than once for the - * same ID. + * This exception is a specialization of [MarshalException] that is + * raised if the system-specific memory limit is exceeded during + * marshaling or unmarshaling. * **/ -local exception AlreadyRegisteredException +local exception MemoryLimitException extends MarshalException { - /** - * - * The kind of object that is registered already: "servant", - * "servant locator", "facet", "object factory", "plug-in", - * "object adapter", "object", or "user exception factory". - * - **/ - string kindOfObject; - - /** - * - * The id (or name) of the object that is registered already. - * - **/ - string id; }; /** * - * This exception is raised if an attempt is made to remove a servant, - * facet, object factory, plug-in, object adapter, object, or user - * exception factory that is not currently registered. + * This exception is a specialization of [MarshalException], + * indicating a malformed data encapsulation. * **/ -local exception NotRegisteredException +local exception EncapsulationException extends MarshalException { - /** - * - * The kind of object that could not be removed: "servant", - * "facet", "object factory", "plug-in", "object adapter", - * "object", or "user exception factory". - * - **/ - string kindOfObject; - - /** - * - * The id (or name) of the object that could not be removed. - * - **/ - string id; }; /** * - * This exception is raised if an attempt is made to invoke an - * operation with [ice_oneway], [ice_batchOneway], [ice_datagram], - * or [ice_batchDatagram] and the operation has a return value, - * out parameters, or an exception specification. + * This exception is a specialization of [MarshalException] that is + * raised if a negative size (e.g., a negative sequence size) is + * received. * **/ -local exception TwowayOnlyException +local exception NegativeSizeException extends MarshalException { - /** - * - * The name of the operation that was invoked. - * - **/ - string operation; }; -/** - * - * This exception is raised if [ice_clone] is called on - * a class that is derived from an abstract Slice class (that is, - * a class containing operations), and the derived class does not - * provide an implementation of the [ice_clone] operation (C++ only). - * - **/ -local exception CloneNotImplementedException -{ -}; }; diff --git a/cpp/slice/Ice/ObjectAdapter.ice b/cpp/slice/Ice/ObjectAdapter.ice index fe7f268fc7a..e4459b2b200 100644 --- a/cpp/slice/Ice/ObjectAdapter.ice +++ b/cpp/slice/Ice/ObjectAdapter.ice @@ -12,7 +12,7 @@ #include <Ice/CommunicatorF.ice> #ifndef ICEE -#include <Ice/ServantLocatorF.ice> +# include <Ice/ServantLocatorF.ice> #endif #include <Ice/RouterF.ice> #include <Ice/LocatorF.ice> |