diff options
| author | Audrius Meskauskas <audriusa@Bioinformatics.org> | 2005-10-05 16:25:42 +0000 |
|---|---|---|
| committer | Audrius Meskauskas <audriusa@Bioinformatics.org> | 2005-10-05 16:25:42 +0000 |
| commit | ddef1e0bd5af8d1befccf9d52040928198acfb34 (patch) | |
| tree | e183916e2ad6261aaa9d6db8f8c4b685e5d49f97 /org | |
| parent | 5da10f6f76f67b348fd63a86b8ba00cbd51fc286 (diff) | |
| download | classpath-ddef1e0bd5af8d1befccf9d52040928198acfb34.tar.gz | |
2005-10-05 Audrius Meskauskas <AudriusA@Bioinformatics.org>
* gnu/CORBA/CDR/cdrInput.java,
gnu/CORBA/EmptyExceptionHolder.java,
gnu/CORBA/ForwardRequestHelper.java,
gnu/CORBA/Functional_ORB.java,
gnu/CORBA/Poa/gnuServantObject.java,
gnu/CORBA/_PolicyImplBase.java,
gnu/CORBA/gnuAny.java,
gnu/CORBA/universalHolder.java,
org/omg/CORBA/CompletionStatus.java,
org/omg/CORBA/NameValuePairHelper.java,
org/omg/CORBA/ObjectHelper.java,
org/omg/CORBA/PolicyHelper.java,
org/omg/CORBA/PolicyListHelper.java,
org/omg/CORBA/ServiceDetailHelper.java,
org/omg/CORBA/StringValueHelper.java,
org/omg/CORBA/WStringValueHelper.java,
org/omg/CosNaming/BindingHelper.java,
org/omg/CosNaming/BindingIteratorHelper.java,
org/omg/CosNaming/BindingIteratorPOA.java,
org/omg/CosNaming/BindingTypeHelper.java,
org/omg/CosNaming/NameComponentHelper.java,
org/omg/CosNaming/NameHelper.java,
org/omg/CosNaming/NamingContextExtHelper.java,
org/omg/CosNaming/NamingContextExtPOA.java,
org/omg/CosNaming/NamingContextHelper.java,
org/omg/CosNaming/NamingContextPOA.java,
org/omg/CosNaming/NamingContextPackage/AlreadyBoundHelper.java,
org/omg/CosNaming/NamingContextPackage/CannotProceedHelper.java,
org/omg/CosNaming/NamingContextPackage/InvalidNameHelper.java,
org/omg/CosNaming/NamingContextPackage/NotEmptyHelper.java,
org/omg/CosNaming/NamingContextPackage/NotFoundHelper.java,
org/omg/CosNaming/NamingContextPackage/NotFoundReasonHelper.java,
org/omg/CosNaming/_BindingIteratorImplBase.java,
org/omg/CosNaming/_NamingContextImplBase.java,
org/omg/DynamicAny/DynAnyFactoryPackage/InconsistentTypeCodeHelper.java,
org/omg/DynamicAny/DynAnyPackage/InvalidValueHelper.java,
org/omg/DynamicAny/DynAnyPackage/TypeMismatchHelper.java,
org/omg/DynamicAny/DynAnySeqHelper.java,
org/omg/DynamicAny/NameDynAnyPairHelper.java,
org/omg/DynamicAny/NameDynAnyPairSeqHelper.java,
org/omg/DynamicAny/NameValuePairHelper.java,
org/omg/DynamicAny/NameValuePairSeqHelper.java,
org/omg/IOP/CodecFactoryPackage/UnknownEncodingHelper.java,
org/omg/IOP/CodecPackage/FormatMismatchHelper.java,
org/omg/IOP/CodecPackage/InvalidTypeForEncodingHelper.java,
org/omg/IOP/CodecPackage/TypeMismatchHelper.java,
org/omg/IOP/IORHelper.java,
org/omg/IOP/MultipleComponentProfileHelper.java,
org/omg/IOP/ServiceContextHelper.java,
org/omg/IOP/ServiceContextListHelper.java,
org/omg/IOP/TaggedComponentHelper.java,
org/omg/IOP/TaggedProfileHelper.java,
org/omg/PortableInterceptor/ForwardRequestHelper.java,
org/omg/PortableInterceptor/InvalidSlotHelper.java,
org/omg/PortableInterceptor/ORBInitInfoPackage/DuplicateNameHelper.java,
org/omg/PortableInterceptor/ORBInitInfoPackage/InvalidNameHelper.java,
org/omg/PortableServer/CurrentPackage/NoContextHelper.java,
org/omg/PortableServer/ForwardRequestHelper.java,
org/omg/PortableServer/IdAssignmentPolicyValue.java,
org/omg/PortableServer/IdUniquenessPolicyValue.java,
org/omg/PortableServer/ImplicitActivationPolicyValue.java,
org/omg/PortableServer/LifespanPolicyValue.java,
org/omg/PortableServer/POAManagerPackage/AdapterInactiveHelper.java,
org/omg/PortableServer/POAManagerPackage/State.java,
org/omg/PortableServer/POAPackage/AdapterAlreadyExistsHelper.java,
org/omg/PortableServer/POAPackage/AdapterNonExistentHelper.java,
org/omg/PortableServer/POAPackage/InvalidPolicyHelper.java,
org/omg/PortableServer/POAPackage/NoServantHelper.java,
org/omg/PortableServer/POAPackage/ObjectAlreadyActiveHelper.java,
org/omg/PortableServer/POAPackage/ObjectNotActiveHelper.java,
org/omg/PortableServer/POAPackage/ServantAlreadyActiveHelper.java,
org/omg/PortableServer/POAPackage/ServantNotActiveHelper.java,
org/omg/PortableServer/POAPackage/WrongAdapterHelper.java,
org/omg/PortableServer/POAPackage/WrongPolicyHelper.java,
org/omg/PortableServer/RequestProcessingPolicyValue.java,
org/omg/PortableServer/Servant.java,
org/omg/PortableServer/ServantLocatorHelper.java,
org/omg/PortableServer/ServantRetentionPolicyValue.java,
org/omg/PortableServer/ThreadPolicyValue.java: Added minor codes for BAD_PARAM and NO_RESOURCES.
* gnu/CORBA/Minor.java: Introduces new minor codes.
* org/omg/CORBA/BAD_OPERATION.java,
org/omg/CORBA/MARSHAL.java,
org/omg/CORBA/NO_RESOURCES.java: Documentation update.
Diffstat (limited to 'org')
74 files changed, 404 insertions, 90 deletions
diff --git a/org/omg/CORBA/BAD_OPERATION.java b/org/omg/CORBA/BAD_OPERATION.java index 26b340665..2649f2a6d 100755 --- a/org/omg/CORBA/BAD_OPERATION.java +++ b/org/omg/CORBA/BAD_OPERATION.java @@ -41,8 +41,76 @@ package org.omg.CORBA; import java.io.Serializable; /** - * Means that the object exists but does not support the operation that - * was invoked on it. + * Means that the object exists but does not support the operation that was + * invoked on it. + * + * In GNU Classpath, this exception may have the following Minor codes: + * + * <table border="1"> + * <tr> + * <th>Hex</th> + * <th>Dec</th> + * <th>Minor</th> + * <th>Name</th> + * <th>Case</th> + * </tr> + * <tr> + * <td>47430000</td> + * <td>1195573248 </td> + * <td>0</td> + * <td>Method</td> + * <td> The remote side requested to invoke the method that is not available on + * that target (client and server probably disagree in the object definition). + * This code is set when the problem arises in the Classpath core; the idlj and + * rmic may generate the user code that sets 0x0 or other value.</td> + * </tr> + * <tr> + * <td>47430009</td> + * <td>1195573257</td> + * <td>9</td> + * <td>Any</td> + * <td> Attempt to extract from the Any value of the different type that was + * stored into that Any. </td> + * </tr> + * <tr> + * <td>4743000a</td> + * <td>1195573258</td> + * <td>10</td> + * <td>Activation</td> + * <td>Failed to activate the inactive object due any reason.</td> + * </tr> + * <tr> + * <td>4743000b</td> + * <td>1195573259</td> + * <td>11</td> + * <td>Policy</td> + * <td> The policies, applying to ORB or POA prevent the requested operation. + * </td> + * </tr> + * <tr> + * <td>4743000c</td> + * <td>1195573260</td> + * <td>12</td> + * <td>Socket</td> + * <td> Socket related errors like failure to open socket on the expected port.</td> + * </tr> + * <tr> + * <td>4743000e</td> + * <td>1195573262</td> + * <td>14</td> + * <td>Enumeration</td> + * <td> The passed value for enumeration is outside the valid range for that + * enumeration. </td> + * </tr> + * <tr> + * <td>4743000f</td> + * <td>1195573263</td> + * <td>15</td> + * <td>PolicyType</td> + * <td> The passed policy code is outside the valid range of the possible + * policies for the given policy type. </td> + * </tr> + * </table> * * @author Audrius Meskauskas (AudriusA@Bioinformatics.org) */ @@ -50,14 +118,15 @@ public class BAD_OPERATION extends SystemException implements Serializable { - /** - * Use serialVersionUID for interoperability. + /** + * Use serialVersionUID for interoperability. */ private static final long serialVersionUID = 1654621651720499682L; /** - * Creates a BAD_OPERATION with the default minor code of 0, - * completion state COMPLETED_NO and the given explaining message. + * Creates a BAD_OPERATION with the default minor code of 0, completion state + * COMPLETED_NO and the given explaining message. + * * @param reasom the explaining message. */ public BAD_OPERATION(String message) @@ -66,16 +135,18 @@ public class BAD_OPERATION } /** - * Creates BAD_OPERATION with the default minor code of 0 and a - * completion state COMPLETED_NO. + * Creates BAD_OPERATION with the default minor code of 0 and a completion + * state COMPLETED_NO. */ public BAD_OPERATION() { super("", 0, CompletionStatus.COMPLETED_NO); } - /** Creates a BAD_OPERATION exception with the specified minor - * code and completion status. + /** + * Creates a BAD_OPERATION exception with the specified minor code and + * completion status. + * * @param minor additional error code. * @param completed the method completion status. */ @@ -86,6 +157,7 @@ public class BAD_OPERATION /** * Created BAD_OPERATION exception, providing full information. + * * @param reason explaining message. * @param minor additional error code (the "minor"). * @param completed the method completion status. diff --git a/org/omg/CORBA/CompletionStatus.java b/org/omg/CORBA/CompletionStatus.java index f9f370443..1ddcca287 100644 --- a/org/omg/CORBA/CompletionStatus.java +++ b/org/omg/CORBA/CompletionStatus.java @@ -38,6 +38,8 @@ exception statement from your version. */ package org.omg.CORBA; +import gnu.CORBA.Minor; + import java.io.Serializable; import org.omg.CORBA.portable.IDLEntity; @@ -108,6 +110,7 @@ public class CompletionStatus /** * Returns the CompletionStatus, matching the given integer constant + * * @param completion one of COMPLETED_YES, COMPLETED_NO or COMPLEED_MAYBE. * @return one of COMPLETED_YES, COMPLETED_NO or COMPLEED_MAYBE. * @throws BAD_PARAM if the parameter is not one of these three valid values. @@ -116,11 +119,14 @@ public class CompletionStatus { try { - return states [ completion ]; + return states[completion]; } catch (ArrayIndexOutOfBoundsException ex) { - throw new BAD_OPERATION("Invalid completion status " + completion); + BAD_OPERATION bad = new BAD_OPERATION("Invalid completion status " + + completion); + bad.minor = Minor.Enumeration; + throw bad; } } diff --git a/org/omg/CORBA/MARSHAL.java b/org/omg/CORBA/MARSHAL.java index 05660b173..2cd92f5a6 100644 --- a/org/omg/CORBA/MARSHAL.java +++ b/org/omg/CORBA/MARSHAL.java @@ -1,39 +1,39 @@ /* MARSHAL.java -- - Copyright (C) 2005 Free Software Foundation, Inc. + Copyright (C) 2005 Free Software Foundation, Inc. - This file is part of GNU Classpath. +This file is part of GNU Classpath. - GNU Classpath is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2, or (at your option) - any later version. +GNU Classpath is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2, or (at your option) +any later version. - GNU Classpath is distributed in the hope that it will be useful, but - WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. +GNU Classpath is distributed in the hope that it will be useful, but +WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +General Public License for more details. - You should have received a copy of the GNU General Public License - along with GNU Classpath; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - 02110-1301 USA. +You should have received a copy of the GNU General Public License +along with GNU Classpath; see the file COPYING. If not, write to the +Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA +02110-1301 USA. - Linking this library statically or dynamically with other modules is - making a combined work based on this library. Thus, the terms and - conditions of the GNU General Public License cover the whole - combination. +Linking this library statically or dynamically with other modules is +making a combined work based on this library. Thus, the terms and +conditions of the GNU General Public License cover the whole +combination. - As a special exception, the copyright holders of this library give you - permission to link this library with independent modules to produce an - executable, regardless of the license terms of these independent - modules, and to copy and distribute the resulting executable under - terms of your choice, provided that you also meet, for each linked - independent module, the terms and conditions of the license of that - module. An independent module is a module which is not derived from - or based on this library. If you modify this library, you may extend - this exception to your version of the library, but you are not - obligated to do so. If you do not wish to do so, delete this - exception statement from your version. */ +As a special exception, the copyright holders of this library give you +permission to link this library with independent modules to produce an +executable, regardless of the license terms of these independent +modules, and to copy and distribute the resulting executable under +terms of your choice, provided that you also meet, for each linked +independent module, the terms and conditions of the license of that +module. An independent module is a module which is not derived from +or based on this library. If you modify this library, you may extend +this exception to your version of the library, but you are not +obligated to do so. If you do not wish to do so, delete this +exception statement from your version. */ package org.omg.CORBA; diff --git a/org/omg/CORBA/NO_RESOURCES.java b/org/omg/CORBA/NO_RESOURCES.java index 262b8ce1a..013bdb674 100644 --- a/org/omg/CORBA/NO_RESOURCES.java +++ b/org/omg/CORBA/NO_RESOURCES.java @@ -41,9 +41,39 @@ package org.omg.CORBA; import java.io.Serializable; /** - * Means that the ORB has reached some general resource limitation like - * maximal number of the opened connections. - * + * Means that the ORB has reached some general resource limitation like maximal + * number of the opened connections. + * + * In GNU Classpath, this exception may have the following minor codes: + * + * <table border="1"> + * <tr> + * <td>Hex</td> + * <td>Dec</td> + * <td>Minor</td> + * <td>Name</td> + * <td>Case</td> + * </tr> + * <tr> + * <td>47430014</td> + * <td>1195573268</td> + * <td>20</td> + * <td>Ports</td> + * <td>No more free ports available for the new objects. The port control, if + * turned on, prevents malicios client from knocking the server out by suddenly + * requiring to allocate a very large number of objects.</td> + * </tr> + * <tr> + * <td>47430015</td> + * <td>1195573269</td> + * <td>21</td> + * <td>Threads</td> + * <td> Too many parallel calls (too many parallel threads). The thread control, + * if turned on, prevents malicios client from knocking the server out by + * suddenly submitting a very large number of requests. </td> + * </tr> + * </table> + * * @author Audrius Meskauskas, Lithuania (AudriusA@Bioinformatics.org) */ public class NO_RESOURCES @@ -56,8 +86,9 @@ public class NO_RESOURCES private static final long serialVersionUID = 8129246118235803597L; /** - * Creates a NO_RESOURCES with the default minor code of 0, - * completion state COMPLETED_NO and the given explaining message. + * Creates a NO_RESOURCES with the default minor code of 0, completion state + * COMPLETED_NO and the given explaining message. + * * @param reasom the explaining message. */ public NO_RESOURCES(String message) @@ -66,32 +97,35 @@ public class NO_RESOURCES } /** - * Creates NO_RESOURCES with the default minor code of 0 and a - * completion state COMPLETED_NO. + * Creates NO_RESOURCES with the default minor code of 0 and a completion + * state COMPLETED_NO. */ public NO_RESOURCES() { super("", 0, CompletionStatus.COMPLETED_NO); } - /** Creates a NO_RESOURCES exception with the specified minor - * code and completion status. - * @param minor additional error code. - * @param completed the method completion status. + /** + * Creates a NO_RESOURCES exception with the specified minor code and + * completion status. + * + * @param a_minor additional error code. + * @param a_completed the method completion status. */ - public NO_RESOURCES(int minor, CompletionStatus completed) + public NO_RESOURCES(int a_minor, CompletionStatus a_completed) { - super("", minor, completed); + super("", a_minor, a_completed); } /** * Created NO_RESOURCES exception, providing full information. - * @param reason explaining message. - * @param minor additional error code (the "minor"). - * @param completed the method completion status. + * + * @param a_reason explaining message. + * @param a_minor additional error code (the "minor"). + * @param a_completed the method completion status. */ - public NO_RESOURCES(String reason, int minor, CompletionStatus completed) + public NO_RESOURCES(String a_reason, int a_minor, CompletionStatus a_completed) { - super(reason, minor, completed); + super(a_reason, a_minor, a_completed); } } diff --git a/org/omg/CORBA/NameValuePairHelper.java b/org/omg/CORBA/NameValuePairHelper.java index f40e570a7..4a77a0339 100644 --- a/org/omg/CORBA/NameValuePairHelper.java +++ b/org/omg/CORBA/NameValuePairHelper.java @@ -39,6 +39,7 @@ exception statement from your version. */ package org.omg.CORBA; import gnu.CORBA.DynAn.NameValuePairHolder; +import gnu.CORBA.Minor; import gnu.CORBA.aliasTypeCode; import gnu.CORBA.primitiveTypeCode; import gnu.CORBA.stringTypeCode; @@ -75,7 +76,9 @@ public abstract class NameValuePairHelper } catch (ClassCastException ex) { - throw new BAD_OPERATION("NameValuePair expected"); + BAD_OPERATION bad = new BAD_OPERATION("NameValuePair expected"); + bad.minor = Minor.Any; + throw bad; } } diff --git a/org/omg/CORBA/ObjectHelper.java b/org/omg/CORBA/ObjectHelper.java index 1324c621f..6c17fe4c8 100644 --- a/org/omg/CORBA/ObjectHelper.java +++ b/org/omg/CORBA/ObjectHelper.java @@ -38,6 +38,7 @@ exception statement from your version. */ package org.omg.CORBA; +import gnu.CORBA.Minor; import gnu.CORBA.primitiveTypeCode; import org.omg.CORBA.portable.InputStream; @@ -63,7 +64,9 @@ public abstract class ObjectHelper } catch (ClassCastException ex) { - throw new BAD_OPERATION("CORBA object expected"); + BAD_OPERATION bad = new BAD_OPERATION("CORBA object expected"); + bad.minor = Minor.Any; + throw bad; } } diff --git a/org/omg/CORBA/PolicyHelper.java b/org/omg/CORBA/PolicyHelper.java index 16b9d94c7..66fb0aa08 100644 --- a/org/omg/CORBA/PolicyHelper.java +++ b/org/omg/CORBA/PolicyHelper.java @@ -38,6 +38,8 @@ exception statement from your version. */ package org.omg.CORBA; +import gnu.CORBA.Minor; + import org.omg.CORBA.Any; import org.omg.CORBA.BAD_OPERATION; import org.omg.CORBA.ORB; @@ -99,7 +101,9 @@ public abstract class PolicyHelper } catch (ClassCastException ex) { - throw new BAD_OPERATION("Policy expected"); + BAD_OPERATION bad = new BAD_OPERATION("Policy expected"); + bad.minor = Minor.Any; + throw bad; } } diff --git a/org/omg/CORBA/PolicyListHelper.java b/org/omg/CORBA/PolicyListHelper.java index f03836a4f..6e4d329b8 100644 --- a/org/omg/CORBA/PolicyListHelper.java +++ b/org/omg/CORBA/PolicyListHelper.java @@ -38,6 +38,8 @@ exception statement from your version. */ package org.omg.CORBA; +import gnu.CORBA.Minor; + import org.omg.CORBA.Any; import org.omg.CORBA.BAD_OPERATION; import org.omg.CORBA.ORB; @@ -97,7 +99,9 @@ public abstract class PolicyListHelper } catch (ClassCastException ex) { - throw new BAD_OPERATION("Policy[] expected"); + BAD_OPERATION bad = new BAD_OPERATION("Policy[] expected"); + bad.minor = Minor.Any; + throw bad; } } diff --git a/org/omg/CORBA/ServiceDetailHelper.java b/org/omg/CORBA/ServiceDetailHelper.java index fe0135d97..58000f2c5 100644 --- a/org/omg/CORBA/ServiceDetailHelper.java +++ b/org/omg/CORBA/ServiceDetailHelper.java @@ -38,6 +38,7 @@ exception statement from your version. */ package org.omg.CORBA; +import gnu.CORBA.Minor; import gnu.CORBA.ServiceDetailHolder; import org.omg.CORBA.portable.InputStream; @@ -78,7 +79,10 @@ public abstract class ServiceDetailHelper } catch (ClassCastException ex) { - throw new BAD_OPERATION(); + BAD_OPERATION bad = new BAD_OPERATION(); + bad.initCause(ex); + bad.minor = Minor.Any; + throw bad; } } diff --git a/org/omg/CORBA/StringValueHelper.java b/org/omg/CORBA/StringValueHelper.java index 7ca088619..bda48c36e 100644 --- a/org/omg/CORBA/StringValueHelper.java +++ b/org/omg/CORBA/StringValueHelper.java @@ -142,7 +142,11 @@ public class StringValueHelper return an_any.extract_string(); } else - throw new BAD_OPERATION("Contains not a string value type"); + { + BAD_OPERATION bad = new BAD_OPERATION("String value type expected"); + bad.minor = Minor.Any; + throw bad; + } } /** diff --git a/org/omg/CORBA/WStringValueHelper.java b/org/omg/CORBA/WStringValueHelper.java index 994260211..7b71b0b7e 100644 --- a/org/omg/CORBA/WStringValueHelper.java +++ b/org/omg/CORBA/WStringValueHelper.java @@ -142,7 +142,11 @@ public class WStringValueHelper return an_any.extract_wstring(); } else - throw new BAD_OPERATION("Contains not a wide string value type"); + { + BAD_OPERATION bad = new BAD_OPERATION("WString value type expected"); + bad.minor = Minor.Any; + throw bad; + } } /** diff --git a/org/omg/CosNaming/BindingHelper.java b/org/omg/CosNaming/BindingHelper.java index 1665464ec..b5b420772 100644 --- a/org/omg/CosNaming/BindingHelper.java +++ b/org/omg/CosNaming/BindingHelper.java @@ -38,6 +38,8 @@ exception statement from your version. */ package org.omg.CosNaming; +import gnu.CORBA.Minor; + import org.omg.CORBA.Any; import org.omg.CORBA.BAD_OPERATION; import org.omg.CORBA.ORB; @@ -74,7 +76,10 @@ public abstract class BindingHelper } catch (ClassCastException ex) { - throw new BAD_OPERATION("Binding expected"); + BAD_OPERATION bad = new BAD_OPERATION("Binding expected"); + bad.minor = Minor.Any; + bad.initCause(ex); + throw bad; } } diff --git a/org/omg/CosNaming/BindingIteratorHelper.java b/org/omg/CosNaming/BindingIteratorHelper.java index 204d9f058..1c3676977 100644 --- a/org/omg/CosNaming/BindingIteratorHelper.java +++ b/org/omg/CosNaming/BindingIteratorHelper.java @@ -38,6 +38,8 @@ exception statement from your version. */ package org.omg.CosNaming; +import gnu.CORBA.Minor; + import org.omg.CORBA.Any; import org.omg.CORBA.BAD_OPERATION; import org.omg.CORBA.BAD_PARAM; @@ -78,6 +80,7 @@ public abstract class BindingIteratorHelper { BAD_OPERATION bad = new BAD_OPERATION("Binding iterator expected"); bad.initCause(ex); + bad.minor = Minor.Any; throw bad; } } diff --git a/org/omg/CosNaming/BindingIteratorPOA.java b/org/omg/CosNaming/BindingIteratorPOA.java index 1aa7521fb..988c4ee91 100644 --- a/org/omg/CosNaming/BindingIteratorPOA.java +++ b/org/omg/CosNaming/BindingIteratorPOA.java @@ -38,6 +38,8 @@ exception statement from your version. */ package org.omg.CosNaming; +import gnu.CORBA.Minor; + import org.omg.CORBA.BAD_OPERATION; import org.omg.CORBA.CompletionStatus; import org.omg.CORBA.portable.InputStream; @@ -103,7 +105,8 @@ public abstract class BindingIteratorPOA out = rh.createReply(); } else - throw new BAD_OPERATION(method, 0, CompletionStatus.COMPLETED_MAYBE); + throw new BAD_OPERATION(method, Minor.Method, + CompletionStatus.COMPLETED_MAYBE); return out; } diff --git a/org/omg/CosNaming/BindingTypeHelper.java b/org/omg/CosNaming/BindingTypeHelper.java index ede00008e..2f0dc71c4 100644 --- a/org/omg/CosNaming/BindingTypeHelper.java +++ b/org/omg/CosNaming/BindingTypeHelper.java @@ -38,6 +38,8 @@ exception statement from your version. */ package org.omg.CosNaming; +import gnu.CORBA.Minor; + import org.omg.CORBA.Any; import org.omg.CORBA.BAD_OPERATION; import org.omg.CORBA.ORB; @@ -71,6 +73,7 @@ public abstract class BindingTypeHelper { BAD_OPERATION bad = new BAD_OPERATION("Binding type expected"); bad.initCause(ex); + bad.minor = Minor.Any; throw bad; } } diff --git a/org/omg/CosNaming/NameComponentHelper.java b/org/omg/CosNaming/NameComponentHelper.java index 9f0e1287e..8499edfe6 100644 --- a/org/omg/CosNaming/NameComponentHelper.java +++ b/org/omg/CosNaming/NameComponentHelper.java @@ -38,6 +38,8 @@ exception statement from your version. */ package org.omg.CosNaming; +import gnu.CORBA.Minor; + import org.omg.CORBA.Any; import org.omg.CORBA.BAD_OPERATION; import org.omg.CORBA.ORB; @@ -76,6 +78,7 @@ public abstract class NameComponentHelper { BAD_OPERATION bad = new BAD_OPERATION("Name component expected"); bad.initCause(ex); + bad.minor = Minor.Any; throw bad; } } diff --git a/org/omg/CosNaming/NameHelper.java b/org/omg/CosNaming/NameHelper.java index 047ad918f..18faf3182 100644 --- a/org/omg/CosNaming/NameHelper.java +++ b/org/omg/CosNaming/NameHelper.java @@ -38,6 +38,8 @@ exception statement from your version. */ package org.omg.CosNaming; +import gnu.CORBA.Minor; + import org.omg.CORBA.Any; import org.omg.CORBA.BAD_OPERATION; import org.omg.CORBA.ORB; @@ -77,6 +79,7 @@ public abstract class NameHelper { BAD_OPERATION bad = new BAD_OPERATION("Name expected"); bad.initCause(ex); + bad.minor = Minor.Any; throw bad; } } diff --git a/org/omg/CosNaming/NamingContextExtHelper.java b/org/omg/CosNaming/NamingContextExtHelper.java index 6e2ef060b..6f4d5bee0 100644 --- a/org/omg/CosNaming/NamingContextExtHelper.java +++ b/org/omg/CosNaming/NamingContextExtHelper.java @@ -38,6 +38,8 @@ exception statement from your version. */ package org.omg.CosNaming; +import gnu.CORBA.Minor; + import org.omg.CORBA.Any; import org.omg.CORBA.BAD_OPERATION; import org.omg.CORBA.BAD_PARAM; @@ -78,6 +80,7 @@ public abstract class NamingContextExtHelper { BAD_OPERATION bad = new BAD_OPERATION("NamingContextExt expected"); bad.initCause(ex); + bad.minor = Minor.Any; throw bad; } } diff --git a/org/omg/CosNaming/NamingContextExtPOA.java b/org/omg/CosNaming/NamingContextExtPOA.java index a6d3346f8..cf5d7b3d8 100644 --- a/org/omg/CosNaming/NamingContextExtPOA.java +++ b/org/omg/CosNaming/NamingContextExtPOA.java @@ -38,6 +38,8 @@ exception statement from your version. */ package org.omg.CosNaming; +import gnu.CORBA.Minor; + import org.omg.CORBA.BAD_OPERATION; import org.omg.CORBA.CompletionStatus; import org.omg.CORBA.ObjectHelper; @@ -189,7 +191,7 @@ public abstract class NamingContextExtPOA OutputStream out = null; Integer call_method = (Integer) _NamingContextImplBase.methods.get(method); if (call_method == null) - throw new BAD_OPERATION(0, CompletionStatus.COMPLETED_MAYBE); + throw new BAD_OPERATION(Minor.Method, CompletionStatus.COMPLETED_MAYBE); switch (call_method.intValue()) { diff --git a/org/omg/CosNaming/NamingContextHelper.java b/org/omg/CosNaming/NamingContextHelper.java index 3a60d9cb4..2b383f13d 100644 --- a/org/omg/CosNaming/NamingContextHelper.java +++ b/org/omg/CosNaming/NamingContextHelper.java @@ -38,6 +38,8 @@ exception statement from your version. */ package org.omg.CosNaming; +import gnu.CORBA.Minor; + import org.omg.CORBA.Any; import org.omg.CORBA.BAD_OPERATION; import org.omg.CORBA.BAD_PARAM; @@ -78,6 +80,7 @@ public abstract class NamingContextHelper { BAD_OPERATION bad = new BAD_OPERATION("Naming context expected"); bad.initCause(ex); + bad.minor = Minor.Any; throw bad; } } diff --git a/org/omg/CosNaming/NamingContextPOA.java b/org/omg/CosNaming/NamingContextPOA.java index a2db0ad35..a97888276 100644 --- a/org/omg/CosNaming/NamingContextPOA.java +++ b/org/omg/CosNaming/NamingContextPOA.java @@ -38,6 +38,8 @@ exception statement from your version. */ package org.omg.CosNaming; +import gnu.CORBA.Minor; + import org.omg.CORBA.BAD_OPERATION; import org.omg.CORBA.CompletionStatus; import org.omg.CORBA.ObjectHelper; @@ -92,7 +94,7 @@ public abstract class NamingContextPOA OutputStream out = null; Integer call_method = (Integer) _NamingContextImplBase.methods.get(method); if (call_method == null) - throw new BAD_OPERATION(0, CompletionStatus.COMPLETED_MAYBE); + throw new BAD_OPERATION(Minor.Method, CompletionStatus.COMPLETED_MAYBE); switch (call_method.intValue()) { diff --git a/org/omg/CosNaming/NamingContextPackage/AlreadyBoundHelper.java b/org/omg/CosNaming/NamingContextPackage/AlreadyBoundHelper.java index 948789521..6bf7bd7a6 100644 --- a/org/omg/CosNaming/NamingContextPackage/AlreadyBoundHelper.java +++ b/org/omg/CosNaming/NamingContextPackage/AlreadyBoundHelper.java @@ -38,6 +38,8 @@ exception statement from your version. */ package org.omg.CosNaming.NamingContextPackage; +import gnu.CORBA.Minor; + import org.omg.CORBA.Any; import org.omg.CORBA.BAD_OPERATION; import org.omg.CORBA.ORB; @@ -75,7 +77,10 @@ public abstract class AlreadyBoundHelper } catch (ClassCastException ex) { - throw new BAD_OPERATION(); + BAD_OPERATION bad = new BAD_OPERATION(); + bad.initCause(ex); + bad.minor = Minor.Any; + throw bad; } } diff --git a/org/omg/CosNaming/NamingContextPackage/CannotProceedHelper.java b/org/omg/CosNaming/NamingContextPackage/CannotProceedHelper.java index d1a1da51e..1d0b6049b 100644 --- a/org/omg/CosNaming/NamingContextPackage/CannotProceedHelper.java +++ b/org/omg/CosNaming/NamingContextPackage/CannotProceedHelper.java @@ -38,6 +38,8 @@ exception statement from your version. */ package org.omg.CosNaming.NamingContextPackage; +import gnu.CORBA.Minor; + import org.omg.CORBA.Any; import org.omg.CORBA.BAD_OPERATION; import org.omg.CORBA.ORB; @@ -78,7 +80,10 @@ public abstract class CannotProceedHelper } catch (ClassCastException ex) { - throw new BAD_OPERATION(); + BAD_OPERATION bad = new BAD_OPERATION(); + bad.initCause(ex); + bad.minor = Minor.Any; + throw bad; } } diff --git a/org/omg/CosNaming/NamingContextPackage/InvalidNameHelper.java b/org/omg/CosNaming/NamingContextPackage/InvalidNameHelper.java index 434713b2d..8f1133602 100644 --- a/org/omg/CosNaming/NamingContextPackage/InvalidNameHelper.java +++ b/org/omg/CosNaming/NamingContextPackage/InvalidNameHelper.java @@ -38,6 +38,8 @@ exception statement from your version. */ package org.omg.CosNaming.NamingContextPackage; +import gnu.CORBA.Minor; + import org.omg.CORBA.Any; import org.omg.CORBA.BAD_OPERATION; import org.omg.CORBA.ORB; @@ -75,7 +77,10 @@ public abstract class InvalidNameHelper } catch (ClassCastException ex) { - throw new BAD_OPERATION(); + BAD_OPERATION bad = new BAD_OPERATION(); + bad.initCause(ex); + bad.minor = Minor.Any; + throw bad; } } diff --git a/org/omg/CosNaming/NamingContextPackage/NotEmptyHelper.java b/org/omg/CosNaming/NamingContextPackage/NotEmptyHelper.java index e1f82994f..6333dfcbc 100644 --- a/org/omg/CosNaming/NamingContextPackage/NotEmptyHelper.java +++ b/org/omg/CosNaming/NamingContextPackage/NotEmptyHelper.java @@ -38,6 +38,8 @@ exception statement from your version. */ package org.omg.CosNaming.NamingContextPackage; +import gnu.CORBA.Minor; + import org.omg.CORBA.Any; import org.omg.CORBA.BAD_OPERATION; import org.omg.CORBA.ORB; @@ -75,7 +77,10 @@ public abstract class NotEmptyHelper } catch (ClassCastException ex) { - throw new BAD_OPERATION(); + BAD_OPERATION bad = new BAD_OPERATION(); + bad.initCause(ex); + bad.minor = Minor.Any; + throw bad; } } diff --git a/org/omg/CosNaming/NamingContextPackage/NotFoundHelper.java b/org/omg/CosNaming/NamingContextPackage/NotFoundHelper.java index 544ab6377..442b7db9e 100644 --- a/org/omg/CosNaming/NamingContextPackage/NotFoundHelper.java +++ b/org/omg/CosNaming/NamingContextPackage/NotFoundHelper.java @@ -38,6 +38,8 @@ exception statement from your version. */ package org.omg.CosNaming.NamingContextPackage; +import gnu.CORBA.Minor; + import org.omg.CORBA.Any; import org.omg.CORBA.BAD_OPERATION; import org.omg.CORBA.ORB; @@ -77,7 +79,10 @@ public abstract class NotFoundHelper } catch (ClassCastException ex) { - throw new BAD_OPERATION(); + BAD_OPERATION bad = new BAD_OPERATION(); + bad.initCause(ex); + bad.minor = Minor.Any; + throw bad; } } diff --git a/org/omg/CosNaming/NamingContextPackage/NotFoundReasonHelper.java b/org/omg/CosNaming/NamingContextPackage/NotFoundReasonHelper.java index b6eacf85f..45a42a0ba 100644 --- a/org/omg/CosNaming/NamingContextPackage/NotFoundReasonHelper.java +++ b/org/omg/CosNaming/NamingContextPackage/NotFoundReasonHelper.java @@ -38,6 +38,8 @@ exception statement from your version. */ package org.omg.CosNaming.NamingContextPackage; +import gnu.CORBA.Minor; + import org.omg.CORBA.Any; import org.omg.CORBA.BAD_OPERATION; import org.omg.CORBA.ORB; @@ -74,7 +76,10 @@ public abstract class NotFoundReasonHelper } catch (ClassCastException ex) { - throw new BAD_OPERATION(); + BAD_OPERATION bad = new BAD_OPERATION(); + bad.initCause(ex); + bad.minor = Minor.Any; + throw bad; } } diff --git a/org/omg/CosNaming/_BindingIteratorImplBase.java b/org/omg/CosNaming/_BindingIteratorImplBase.java index 53c0dd3a6..9c7e1b347 100644 --- a/org/omg/CosNaming/_BindingIteratorImplBase.java +++ b/org/omg/CosNaming/_BindingIteratorImplBase.java @@ -38,6 +38,8 @@ exception statement from your version. */ package org.omg.CosNaming; +import gnu.CORBA.Minor; + import org.omg.CORBA.BAD_OPERATION; import org.omg.CORBA.BooleanHolder; import org.omg.CORBA.CompletionStatus; @@ -114,7 +116,8 @@ public abstract class _BindingIteratorImplBase out = rh.createReply(); } else - throw new BAD_OPERATION(method, 0, CompletionStatus.COMPLETED_MAYBE); + throw new BAD_OPERATION(method, Minor.Method, + CompletionStatus.COMPLETED_MAYBE); return out; } diff --git a/org/omg/CosNaming/_NamingContextImplBase.java b/org/omg/CosNaming/_NamingContextImplBase.java index 7c1fb3a1d..33bddef5d 100644 --- a/org/omg/CosNaming/_NamingContextImplBase.java +++ b/org/omg/CosNaming/_NamingContextImplBase.java @@ -38,6 +38,8 @@ exception statement from your version. */ package org.omg.CosNaming; +import gnu.CORBA.Minor; + import org.omg.CORBA.BAD_OPERATION; import org.omg.CORBA.CompletionStatus; import org.omg.CORBA.DynamicImplementation; @@ -123,7 +125,7 @@ public abstract class _NamingContextImplBase OutputStream out = null; Integer call_method = (Integer) methods.get(method); if (call_method == null) - throw new BAD_OPERATION(0, CompletionStatus.COMPLETED_MAYBE); + throw new BAD_OPERATION(Minor.Method, CompletionStatus.COMPLETED_MAYBE); switch (call_method.intValue()) { @@ -389,7 +391,7 @@ public abstract class _NamingContextImplBase // The server request contains no required result type. Integer call_method = (Integer) methods.get(request.operation()); if (call_method == null) - throw new BAD_OPERATION(0, CompletionStatus.COMPLETED_MAYBE); + throw new BAD_OPERATION(Minor.Method, CompletionStatus.COMPLETED_MAYBE); switch (call_method.intValue()) { diff --git a/org/omg/DynamicAny/DynAnyFactoryPackage/InconsistentTypeCodeHelper.java b/org/omg/DynamicAny/DynAnyFactoryPackage/InconsistentTypeCodeHelper.java index c7b54bef8..a9f45c4b7 100644 --- a/org/omg/DynamicAny/DynAnyFactoryPackage/InconsistentTypeCodeHelper.java +++ b/org/omg/DynamicAny/DynAnyFactoryPackage/InconsistentTypeCodeHelper.java @@ -39,6 +39,7 @@ exception statement from your version. */ package org.omg.DynamicAny.DynAnyFactoryPackage; import gnu.CORBA.EmptyExceptionHolder; +import gnu.CORBA.Minor; import org.omg.CORBA.Any; import org.omg.CORBA.BAD_OPERATION; @@ -106,6 +107,7 @@ public abstract class InconsistentTypeCodeHelper { BAD_OPERATION bad = new BAD_OPERATION("InconsistentTypeCode expected"); bad.initCause(cex); + bad.minor = Minor.Any; throw bad; } } diff --git a/org/omg/DynamicAny/DynAnyPackage/InvalidValueHelper.java b/org/omg/DynamicAny/DynAnyPackage/InvalidValueHelper.java index 55e35eedc..1b5004f07 100644 --- a/org/omg/DynamicAny/DynAnyPackage/InvalidValueHelper.java +++ b/org/omg/DynamicAny/DynAnyPackage/InvalidValueHelper.java @@ -39,6 +39,7 @@ exception statement from your version. */ package org.omg.DynamicAny.DynAnyPackage; import gnu.CORBA.EmptyExceptionHolder; +import gnu.CORBA.Minor; import org.omg.CORBA.Any; import org.omg.CORBA.BAD_OPERATION; @@ -107,6 +108,7 @@ public abstract class InvalidValueHelper { BAD_OPERATION bad = new BAD_OPERATION("InvalidValue expected"); bad.initCause(cex); + bad.minor = Minor.Any; throw bad; } } diff --git a/org/omg/DynamicAny/DynAnyPackage/TypeMismatchHelper.java b/org/omg/DynamicAny/DynAnyPackage/TypeMismatchHelper.java index e15fb72c6..b09ab4db8 100644 --- a/org/omg/DynamicAny/DynAnyPackage/TypeMismatchHelper.java +++ b/org/omg/DynamicAny/DynAnyPackage/TypeMismatchHelper.java @@ -39,6 +39,7 @@ exception statement from your version. */ package org.omg.DynamicAny.DynAnyPackage; import gnu.CORBA.EmptyExceptionHolder; +import gnu.CORBA.Minor; import org.omg.CORBA.Any; import org.omg.CORBA.BAD_OPERATION; @@ -107,6 +108,7 @@ public abstract class TypeMismatchHelper { BAD_OPERATION bad = new BAD_OPERATION("TypeMismatch expected"); bad.initCause(cex); + bad.minor = Minor.Any; throw bad; } } diff --git a/org/omg/DynamicAny/DynAnySeqHelper.java b/org/omg/DynamicAny/DynAnySeqHelper.java index 87e344523..ec3f0c481 100644 --- a/org/omg/DynamicAny/DynAnySeqHelper.java +++ b/org/omg/DynamicAny/DynAnySeqHelper.java @@ -39,6 +39,7 @@ exception statement from your version. */ package org.omg.DynamicAny; import gnu.CORBA.DynAnySeqHolder; +import gnu.CORBA.Minor; import org.omg.CORBA.Any; import org.omg.CORBA.BAD_OPERATION; @@ -106,6 +107,7 @@ public abstract class DynAnySeqHelper { BAD_OPERATION bad = new BAD_OPERATION("DynAnySeq expected"); bad.initCause(cex); + bad.minor = Minor.Any; throw bad; } } diff --git a/org/omg/DynamicAny/NameDynAnyPairHelper.java b/org/omg/DynamicAny/NameDynAnyPairHelper.java index d649800b8..a0e5c6b85 100644 --- a/org/omg/DynamicAny/NameDynAnyPairHelper.java +++ b/org/omg/DynamicAny/NameDynAnyPairHelper.java @@ -38,6 +38,7 @@ exception statement from your version. */ package org.omg.DynamicAny; +import gnu.CORBA.Minor; import gnu.CORBA.NameDynAnyPairHolder; import org.omg.CORBA.Any; @@ -83,6 +84,7 @@ public abstract class NameDynAnyPairHelper { BAD_OPERATION bad = new BAD_OPERATION("NameDynAnyPair expected"); bad.initCause(cex); + bad.minor = Minor.Any; throw bad; } } diff --git a/org/omg/DynamicAny/NameDynAnyPairSeqHelper.java b/org/omg/DynamicAny/NameDynAnyPairSeqHelper.java index f110926b8..ec4f72822 100644 --- a/org/omg/DynamicAny/NameDynAnyPairSeqHelper.java +++ b/org/omg/DynamicAny/NameDynAnyPairSeqHelper.java @@ -38,6 +38,7 @@ exception statement from your version. */ package org.omg.DynamicAny; +import gnu.CORBA.Minor; import gnu.CORBA.NameDynAnyPairSeqHolder; import org.omg.CORBA.Any; @@ -105,6 +106,7 @@ public abstract class NameDynAnyPairSeqHelper { BAD_OPERATION bad = new BAD_OPERATION("NameDynAnyPairSeq expected"); bad.initCause(cex); + bad.minor = Minor.Any; throw bad; } } diff --git a/org/omg/DynamicAny/NameValuePairHelper.java b/org/omg/DynamicAny/NameValuePairHelper.java index a3d5bff45..1e0f52b59 100644 --- a/org/omg/DynamicAny/NameValuePairHelper.java +++ b/org/omg/DynamicAny/NameValuePairHelper.java @@ -38,6 +38,7 @@ exception statement from your version. */ package org.omg.DynamicAny; +import gnu.CORBA.Minor; import gnu.CORBA.NameValuePairHolder; import org.omg.CORBA.Any; @@ -118,6 +119,7 @@ public abstract class NameValuePairHelper { BAD_OPERATION bad = new BAD_OPERATION("NameValuePair expected"); bad.initCause(cex); + bad.minor = Minor.Any; throw bad; } } diff --git a/org/omg/DynamicAny/NameValuePairSeqHelper.java b/org/omg/DynamicAny/NameValuePairSeqHelper.java index 400708e18..62481534e 100644 --- a/org/omg/DynamicAny/NameValuePairSeqHelper.java +++ b/org/omg/DynamicAny/NameValuePairSeqHelper.java @@ -38,6 +38,7 @@ exception statement from your version. */ package org.omg.DynamicAny; +import gnu.CORBA.Minor; import gnu.CORBA.NameValuePairSeqHolder; import org.omg.CORBA.Any; @@ -98,6 +99,7 @@ public abstract class NameValuePairSeqHelper { BAD_OPERATION bad = new BAD_OPERATION("NameValuePairSeq expected"); bad.initCause(cex); + bad.minor = Minor.Any; throw bad; } } diff --git a/org/omg/IOP/CodecFactoryPackage/UnknownEncodingHelper.java b/org/omg/IOP/CodecFactoryPackage/UnknownEncodingHelper.java index a1082178c..e036dbf1f 100644 --- a/org/omg/IOP/CodecFactoryPackage/UnknownEncodingHelper.java +++ b/org/omg/IOP/CodecFactoryPackage/UnknownEncodingHelper.java @@ -39,6 +39,7 @@ exception statement from your version. */ package org.omg.IOP.CodecFactoryPackage; import gnu.CORBA.EmptyExceptionHolder; +import gnu.CORBA.Minor; import org.omg.CORBA.ORB; import org.omg.CORBA.Any; @@ -108,6 +109,7 @@ public abstract class UnknownEncodingHelper { BAD_OPERATION bad = new BAD_OPERATION("UnknownEncoding expected"); bad.initCause(cex); + bad.minor = Minor.Any; throw bad; } } diff --git a/org/omg/IOP/CodecPackage/FormatMismatchHelper.java b/org/omg/IOP/CodecPackage/FormatMismatchHelper.java index e5910ac57..e353be8f9 100644 --- a/org/omg/IOP/CodecPackage/FormatMismatchHelper.java +++ b/org/omg/IOP/CodecPackage/FormatMismatchHelper.java @@ -39,6 +39,7 @@ exception statement from your version. */ package org.omg.IOP.CodecPackage; import gnu.CORBA.EmptyExceptionHolder; +import gnu.CORBA.Minor; import org.omg.CORBA.Any; import org.omg.CORBA.BAD_OPERATION; @@ -103,6 +104,7 @@ public abstract class FormatMismatchHelper catch (ClassCastException cex) { BAD_OPERATION bad = new BAD_OPERATION("FormatMismatch expected"); + bad.minor = Minor.Any; bad.initCause(cex); throw bad; } diff --git a/org/omg/IOP/CodecPackage/InvalidTypeForEncodingHelper.java b/org/omg/IOP/CodecPackage/InvalidTypeForEncodingHelper.java index 6c4ce52f0..8a93c5895 100644 --- a/org/omg/IOP/CodecPackage/InvalidTypeForEncodingHelper.java +++ b/org/omg/IOP/CodecPackage/InvalidTypeForEncodingHelper.java @@ -39,6 +39,7 @@ exception statement from your version. */ package org.omg.IOP.CodecPackage; import gnu.CORBA.EmptyExceptionHolder; +import gnu.CORBA.Minor; import org.omg.CORBA.Any; import org.omg.CORBA.BAD_OPERATION; @@ -106,6 +107,7 @@ public abstract class InvalidTypeForEncodingHelper { BAD_OPERATION bad = new BAD_OPERATION("InvalidTypeForEncoding expected"); + bad.minor = Minor.Any; bad.initCause(cex); throw bad; } diff --git a/org/omg/IOP/CodecPackage/TypeMismatchHelper.java b/org/omg/IOP/CodecPackage/TypeMismatchHelper.java index 9f4228637..33951de70 100644 --- a/org/omg/IOP/CodecPackage/TypeMismatchHelper.java +++ b/org/omg/IOP/CodecPackage/TypeMismatchHelper.java @@ -39,6 +39,7 @@ exception statement from your version. */ package org.omg.IOP.CodecPackage; import gnu.CORBA.EmptyExceptionHolder; +import gnu.CORBA.Minor; import org.omg.CORBA.Any; import org.omg.CORBA.BAD_OPERATION; @@ -103,6 +104,7 @@ public abstract class TypeMismatchHelper catch (ClassCastException cex) { BAD_OPERATION bad = new BAD_OPERATION("TypeMismatch expected"); + bad.minor = Minor.Any; bad.initCause(cex); throw bad; } diff --git a/org/omg/IOP/IORHelper.java b/org/omg/IOP/IORHelper.java index 5945bb75a..77f18d9b9 100644 --- a/org/omg/IOP/IORHelper.java +++ b/org/omg/IOP/IORHelper.java @@ -38,6 +38,8 @@ exception statement from your version. */ package org.omg.IOP; +import gnu.CORBA.Minor; + import org.omg.CORBA.Any; import org.omg.CORBA.BAD_OPERATION; import org.omg.CORBA.ORB; @@ -111,6 +113,7 @@ public abstract class IORHelper catch (ClassCastException cex) { BAD_OPERATION bad = new BAD_OPERATION("IOR expected"); + bad.minor = Minor.Any; bad.initCause(cex); throw bad; } diff --git a/org/omg/IOP/MultipleComponentProfileHelper.java b/org/omg/IOP/MultipleComponentProfileHelper.java index bc26068c9..6f5156fe2 100644 --- a/org/omg/IOP/MultipleComponentProfileHelper.java +++ b/org/omg/IOP/MultipleComponentProfileHelper.java @@ -38,6 +38,8 @@ exception statement from your version. */ package org.omg.IOP; +import gnu.CORBA.Minor; + import org.omg.CORBA.ORB; import org.omg.CORBA.Any; import org.omg.CORBA.TypeCode; @@ -96,6 +98,7 @@ public abstract class MultipleComponentProfileHelper catch (ClassCastException cex) { BAD_OPERATION bad = new BAD_OPERATION("MultipleComponentProfile expected"); + bad.minor = Minor.Any; bad.initCause(cex); throw bad; } diff --git a/org/omg/IOP/ServiceContextHelper.java b/org/omg/IOP/ServiceContextHelper.java index a8224a64c..5693a3235 100644 --- a/org/omg/IOP/ServiceContextHelper.java +++ b/org/omg/IOP/ServiceContextHelper.java @@ -38,6 +38,8 @@ exception statement from your version. */ package org.omg.IOP; +import gnu.CORBA.Minor; + import org.omg.CORBA.Any; import org.omg.CORBA.BAD_OPERATION; import org.omg.CORBA.ORB; @@ -115,6 +117,7 @@ public abstract class ServiceContextHelper catch (ClassCastException cex) { BAD_OPERATION bad = new BAD_OPERATION("ServiceContext expected"); + bad.minor = Minor.Any; bad.initCause(cex); throw bad; } diff --git a/org/omg/IOP/ServiceContextListHelper.java b/org/omg/IOP/ServiceContextListHelper.java index 11bbe253f..fa436cbb8 100644 --- a/org/omg/IOP/ServiceContextListHelper.java +++ b/org/omg/IOP/ServiceContextListHelper.java @@ -38,6 +38,8 @@ exception statement from your version. */ package org.omg.IOP; +import gnu.CORBA.Minor; + import org.omg.CORBA.Any; import org.omg.CORBA.BAD_OPERATION; import org.omg.CORBA.ORB; @@ -94,7 +96,10 @@ public abstract class ServiceContextListHelper } catch (ClassCastException ex) { - throw new BAD_OPERATION("ServiceContext[] expected."); + BAD_OPERATION bad = new BAD_OPERATION("ServiceContext[] expected"); + bad.minor = Minor.Any; + bad.initCause(ex); + throw bad; } } diff --git a/org/omg/IOP/TaggedComponentHelper.java b/org/omg/IOP/TaggedComponentHelper.java index 2ad22d479..eaee120f0 100644 --- a/org/omg/IOP/TaggedComponentHelper.java +++ b/org/omg/IOP/TaggedComponentHelper.java @@ -117,6 +117,7 @@ public abstract class TaggedComponentHelper catch (ClassCastException cex) { BAD_OPERATION bad = new BAD_OPERATION("TaggedComponent expected"); + bad.minor = Minor.Any; bad.initCause(cex); throw bad; } diff --git a/org/omg/IOP/TaggedProfileHelper.java b/org/omg/IOP/TaggedProfileHelper.java index 7581111d8..d462b6bcf 100644 --- a/org/omg/IOP/TaggedProfileHelper.java +++ b/org/omg/IOP/TaggedProfileHelper.java @@ -119,6 +119,7 @@ public abstract class TaggedProfileHelper catch (ClassCastException cex) { BAD_OPERATION bad = new BAD_OPERATION("TaggedProfile expected"); + bad.minor = Minor.Any; bad.initCause(cex); throw bad; } diff --git a/org/omg/PortableInterceptor/ForwardRequestHelper.java b/org/omg/PortableInterceptor/ForwardRequestHelper.java index 11d6b7f0f..5db56d745 100644 --- a/org/omg/PortableInterceptor/ForwardRequestHelper.java +++ b/org/omg/PortableInterceptor/ForwardRequestHelper.java @@ -38,6 +38,7 @@ exception statement from your version. */ package org.omg.PortableInterceptor; +import gnu.CORBA.Minor; import gnu.CORBA.Interceptor.ForwardRequestHolder; import org.omg.CORBA.Any; @@ -106,6 +107,7 @@ public abstract class ForwardRequestHelper catch (ClassCastException cex) { BAD_OPERATION bad = new BAD_OPERATION(id() + " expected"); + bad.minor = Minor.Any; bad.initCause(cex); throw bad; } diff --git a/org/omg/PortableInterceptor/InvalidSlotHelper.java b/org/omg/PortableInterceptor/InvalidSlotHelper.java index c0aa0ee1b..98b259677 100644 --- a/org/omg/PortableInterceptor/InvalidSlotHelper.java +++ b/org/omg/PortableInterceptor/InvalidSlotHelper.java @@ -39,6 +39,7 @@ exception statement from your version. */ package org.omg.PortableInterceptor; import gnu.CORBA.EmptyExceptionHolder; +import gnu.CORBA.Minor; import org.omg.CORBA.Any; import org.omg.CORBA.BAD_OPERATION; @@ -106,6 +107,7 @@ public abstract class InvalidSlotHelper catch (ClassCastException cex) { BAD_OPERATION bad = new BAD_OPERATION("InvalidSlot expected"); + bad.minor = Minor.Any; bad.initCause(cex); throw bad; } diff --git a/org/omg/PortableInterceptor/ORBInitInfoPackage/DuplicateNameHelper.java b/org/omg/PortableInterceptor/ORBInitInfoPackage/DuplicateNameHelper.java index a5c83fa80..648e9679b 100644 --- a/org/omg/PortableInterceptor/ORBInitInfoPackage/DuplicateNameHelper.java +++ b/org/omg/PortableInterceptor/ORBInitInfoPackage/DuplicateNameHelper.java @@ -110,6 +110,7 @@ public abstract class DuplicateNameHelper catch (ClassCastException cex) { BAD_OPERATION bad = new BAD_OPERATION("DuplicateName expected"); + bad.minor = Minor.Any; bad.initCause(cex); throw bad; } diff --git a/org/omg/PortableInterceptor/ORBInitInfoPackage/InvalidNameHelper.java b/org/omg/PortableInterceptor/ORBInitInfoPackage/InvalidNameHelper.java index 7f1132f98..f89f9d4c6 100644 --- a/org/omg/PortableInterceptor/ORBInitInfoPackage/InvalidNameHelper.java +++ b/org/omg/PortableInterceptor/ORBInitInfoPackage/InvalidNameHelper.java @@ -39,6 +39,7 @@ exception statement from your version. */ package org.omg.PortableInterceptor.ORBInitInfoPackage; import gnu.CORBA.EmptyExceptionHolder; +import gnu.CORBA.Minor; import org.omg.CORBA.Any; import org.omg.CORBA.BAD_OPERATION; @@ -103,6 +104,7 @@ public abstract class InvalidNameHelper catch (ClassCastException cex) { BAD_OPERATION bad = new BAD_OPERATION("InvalidName expected"); + bad.minor = Minor.Any; bad.initCause(cex); throw bad; } diff --git a/org/omg/PortableServer/CurrentPackage/NoContextHelper.java b/org/omg/PortableServer/CurrentPackage/NoContextHelper.java index 0ba635200..848a3c3d3 100644 --- a/org/omg/PortableServer/CurrentPackage/NoContextHelper.java +++ b/org/omg/PortableServer/CurrentPackage/NoContextHelper.java @@ -39,6 +39,7 @@ exception statement from your version. */ package org.omg.PortableServer.CurrentPackage; import gnu.CORBA.EmptyExceptionHolder; +import gnu.CORBA.Minor; import org.omg.CORBA.Any; import org.omg.CORBA.BAD_OPERATION; @@ -105,6 +106,7 @@ public abstract class NoContextHelper catch (ClassCastException cex) { BAD_OPERATION bad = new BAD_OPERATION("NoContext expected"); + bad.minor = Minor.Any; bad.initCause(cex); throw bad; } diff --git a/org/omg/PortableServer/ForwardRequestHelper.java b/org/omg/PortableServer/ForwardRequestHelper.java index 6f8d5ea6b..f4b0619b0 100644 --- a/org/omg/PortableServer/ForwardRequestHelper.java +++ b/org/omg/PortableServer/ForwardRequestHelper.java @@ -38,6 +38,7 @@ exception statement from your version. */ package org.omg.PortableServer; +import gnu.CORBA.Minor; import gnu.CORBA.Poa.ForwardRequestHolder; import org.omg.CORBA.Any; @@ -80,6 +81,7 @@ public abstract class ForwardRequestHelper catch (ClassCastException cex) { BAD_OPERATION bad = new BAD_OPERATION("ForwardRequest expected"); + bad.minor = Minor.Any; bad.initCause(cex); throw bad; } diff --git a/org/omg/PortableServer/IdAssignmentPolicyValue.java b/org/omg/PortableServer/IdAssignmentPolicyValue.java index 2dda0ef2b..ac81d389c 100644 --- a/org/omg/PortableServer/IdAssignmentPolicyValue.java +++ b/org/omg/PortableServer/IdAssignmentPolicyValue.java @@ -38,6 +38,8 @@ exception statement from your version. */ package org.omg.PortableServer; +import gnu.CORBA.Minor; + import org.omg.CORBA.BAD_OPERATION; import org.omg.CORBA.portable.IDLEntity; @@ -129,7 +131,9 @@ public class IdAssignmentPolicyValue } catch (ArrayIndexOutOfBoundsException ex) { - throw new BAD_OPERATION("Invalid enumeration code " + code); + BAD_OPERATION bad = new BAD_OPERATION("Invalid policy code " + code); + bad.minor = Minor.PolicyType; + throw bad; } } diff --git a/org/omg/PortableServer/IdUniquenessPolicyValue.java b/org/omg/PortableServer/IdUniquenessPolicyValue.java index d0992d9db..c0f281249 100644 --- a/org/omg/PortableServer/IdUniquenessPolicyValue.java +++ b/org/omg/PortableServer/IdUniquenessPolicyValue.java @@ -38,6 +38,8 @@ exception statement from your version. */ package org.omg.PortableServer; +import gnu.CORBA.Minor; + import org.omg.CORBA.BAD_OPERATION; import org.omg.CORBA.portable.IDLEntity; @@ -129,7 +131,9 @@ public class IdUniquenessPolicyValue } catch (ArrayIndexOutOfBoundsException ex) { - throw new BAD_OPERATION("Invalid enumeration code " + code); + BAD_OPERATION bad = new BAD_OPERATION("Invalid policy code " + code); + bad.minor = Minor.PolicyType; + throw bad; } } diff --git a/org/omg/PortableServer/ImplicitActivationPolicyValue.java b/org/omg/PortableServer/ImplicitActivationPolicyValue.java index 8d2913bf6..9d81d5fab 100644 --- a/org/omg/PortableServer/ImplicitActivationPolicyValue.java +++ b/org/omg/PortableServer/ImplicitActivationPolicyValue.java @@ -38,6 +38,8 @@ exception statement from your version. */ package org.omg.PortableServer; +import gnu.CORBA.Minor; + import org.omg.CORBA.BAD_OPERATION; import org.omg.CORBA.portable.IDLEntity; @@ -129,7 +131,9 @@ public class ImplicitActivationPolicyValue } catch (ArrayIndexOutOfBoundsException ex) { - throw new BAD_OPERATION("Invalid enumeration code " + code); + BAD_OPERATION bad = new BAD_OPERATION("Invalid policy code " + code); + bad.minor = Minor.PolicyType; + throw bad; } } diff --git a/org/omg/PortableServer/LifespanPolicyValue.java b/org/omg/PortableServer/LifespanPolicyValue.java index 1e046c4e9..117eb5a3c 100644 --- a/org/omg/PortableServer/LifespanPolicyValue.java +++ b/org/omg/PortableServer/LifespanPolicyValue.java @@ -38,6 +38,8 @@ exception statement from your version. */ package org.omg.PortableServer; +import gnu.CORBA.Minor; + import org.omg.CORBA.BAD_OPERATION; import org.omg.CORBA.portable.IDLEntity; @@ -126,7 +128,9 @@ public class LifespanPolicyValue } catch (ArrayIndexOutOfBoundsException ex) { - throw new BAD_OPERATION("Invalid enumeration code " + code); + BAD_OPERATION bad = new BAD_OPERATION("Invalid policy code " + code); + bad.minor = Minor.PolicyType; + throw bad; } } diff --git a/org/omg/PortableServer/POAManagerPackage/AdapterInactiveHelper.java b/org/omg/PortableServer/POAManagerPackage/AdapterInactiveHelper.java index db7b965bb..2a587a412 100644 --- a/org/omg/PortableServer/POAManagerPackage/AdapterInactiveHelper.java +++ b/org/omg/PortableServer/POAManagerPackage/AdapterInactiveHelper.java @@ -39,6 +39,7 @@ exception statement from your version. */ package org.omg.PortableServer.POAManagerPackage; import gnu.CORBA.EmptyExceptionHolder; +import gnu.CORBA.Minor; import org.omg.CORBA.Any; import org.omg.CORBA.BAD_OPERATION; @@ -106,6 +107,7 @@ public abstract class AdapterInactiveHelper catch (ClassCastException cex) { BAD_OPERATION bad = new BAD_OPERATION("AdapterInactive expected"); + bad.minor = Minor.Any; bad.initCause(cex); throw bad; } diff --git a/org/omg/PortableServer/POAManagerPackage/State.java b/org/omg/PortableServer/POAManagerPackage/State.java index 536189a0c..9e856098b 100644 --- a/org/omg/PortableServer/POAManagerPackage/State.java +++ b/org/omg/PortableServer/POAManagerPackage/State.java @@ -38,6 +38,8 @@ exception statement from your version. */ package org.omg.PortableServer.POAManagerPackage; +import gnu.CORBA.Minor; + import org.omg.CORBA.BAD_OPERATION; import org.omg.CORBA.portable.IDLEntity; @@ -140,7 +142,7 @@ public class State /** * Returns the State, matching the given integer constant. - * + * * @param code one of _HOLDING, _ACTIVE, _DISCARDING, _INACTIVE. * @return one of HOLDING, ACTIVE, DISCARDING, INACTIVE. * @throws BAD_PARAM if the parameter is not one of the valid values. @@ -149,16 +151,19 @@ public class State { try { - return enume [ code ]; + return enume[code]; } catch (ArrayIndexOutOfBoundsException ex) { - throw new BAD_OPERATION("Invalid enumeration code " + code); + BAD_OPERATION bad = new BAD_OPERATION("Invalid state " + code); + bad.minor = Minor.Enumeration; + throw bad; } } /** * Returns a short string representation. + * * @return the name of the current enumeration value. */ public String toString() diff --git a/org/omg/PortableServer/POAPackage/AdapterAlreadyExistsHelper.java b/org/omg/PortableServer/POAPackage/AdapterAlreadyExistsHelper.java index 3ffee4ff8..61a410891 100644 --- a/org/omg/PortableServer/POAPackage/AdapterAlreadyExistsHelper.java +++ b/org/omg/PortableServer/POAPackage/AdapterAlreadyExistsHelper.java @@ -39,6 +39,7 @@ exception statement from your version. */ package org.omg.PortableServer.POAPackage; import gnu.CORBA.EmptyExceptionHolder; +import gnu.CORBA.Minor; import org.omg.CORBA.Any; import org.omg.CORBA.BAD_OPERATION; @@ -107,6 +108,7 @@ public abstract class AdapterAlreadyExistsHelper catch (ClassCastException cex) { BAD_OPERATION bad = new BAD_OPERATION("AdapterAlreadyExists expected"); + bad.minor = Minor.Any; bad.initCause(cex); throw bad; } diff --git a/org/omg/PortableServer/POAPackage/AdapterNonExistentHelper.java b/org/omg/PortableServer/POAPackage/AdapterNonExistentHelper.java index f05daec3d..dd318bf09 100644 --- a/org/omg/PortableServer/POAPackage/AdapterNonExistentHelper.java +++ b/org/omg/PortableServer/POAPackage/AdapterNonExistentHelper.java @@ -39,6 +39,7 @@ exception statement from your version. */ package org.omg.PortableServer.POAPackage; import gnu.CORBA.EmptyExceptionHolder; +import gnu.CORBA.Minor; import org.omg.CORBA.Any; import org.omg.CORBA.BAD_OPERATION; @@ -106,6 +107,7 @@ public abstract class AdapterNonExistentHelper catch (ClassCastException cex) { BAD_OPERATION bad = new BAD_OPERATION("AdapterNonExistent expected"); + bad.minor = Minor.Any; bad.initCause(cex); throw bad; } diff --git a/org/omg/PortableServer/POAPackage/InvalidPolicyHelper.java b/org/omg/PortableServer/POAPackage/InvalidPolicyHelper.java index 15aa62d82..5e9e627c7 100644 --- a/org/omg/PortableServer/POAPackage/InvalidPolicyHelper.java +++ b/org/omg/PortableServer/POAPackage/InvalidPolicyHelper.java @@ -38,6 +38,7 @@ exception statement from your version. */ package org.omg.PortableServer.POAPackage; +import gnu.CORBA.Minor; import gnu.CORBA.Poa.InvalidPolicyHolder; import org.omg.CORBA.Any; @@ -110,6 +111,7 @@ public abstract class InvalidPolicyHelper catch (ClassCastException cex) { BAD_OPERATION bad = new BAD_OPERATION("InvalidPolicy expected"); + bad.minor = Minor.Any; bad.initCause(cex); throw bad; } diff --git a/org/omg/PortableServer/POAPackage/NoServantHelper.java b/org/omg/PortableServer/POAPackage/NoServantHelper.java index 26b21ce6c..fd2c189fc 100644 --- a/org/omg/PortableServer/POAPackage/NoServantHelper.java +++ b/org/omg/PortableServer/POAPackage/NoServantHelper.java @@ -39,6 +39,7 @@ exception statement from your version. */ package org.omg.PortableServer.POAPackage; import gnu.CORBA.EmptyExceptionHolder; +import gnu.CORBA.Minor; import org.omg.CORBA.Any; import org.omg.CORBA.BAD_OPERATION; @@ -106,6 +107,7 @@ public abstract class NoServantHelper catch (ClassCastException cex) { BAD_OPERATION bad = new BAD_OPERATION("NoServant expected"); + bad.minor = Minor.Any; bad.initCause(cex); throw bad; } diff --git a/org/omg/PortableServer/POAPackage/ObjectAlreadyActiveHelper.java b/org/omg/PortableServer/POAPackage/ObjectAlreadyActiveHelper.java index 99891dbe5..011867473 100644 --- a/org/omg/PortableServer/POAPackage/ObjectAlreadyActiveHelper.java +++ b/org/omg/PortableServer/POAPackage/ObjectAlreadyActiveHelper.java @@ -39,6 +39,7 @@ exception statement from your version. */ package org.omg.PortableServer.POAPackage; import gnu.CORBA.EmptyExceptionHolder; +import gnu.CORBA.Minor; import org.omg.CORBA.Any; import org.omg.CORBA.BAD_OPERATION; @@ -107,6 +108,7 @@ public abstract class ObjectAlreadyActiveHelper catch (ClassCastException cex) { BAD_OPERATION bad = new BAD_OPERATION("ObjectAlreadyActive expected"); + bad.minor = Minor.Any; bad.initCause(cex); throw bad; } diff --git a/org/omg/PortableServer/POAPackage/ObjectNotActiveHelper.java b/org/omg/PortableServer/POAPackage/ObjectNotActiveHelper.java index 867d5f4f6..0d8ff473c 100644 --- a/org/omg/PortableServer/POAPackage/ObjectNotActiveHelper.java +++ b/org/omg/PortableServer/POAPackage/ObjectNotActiveHelper.java @@ -39,6 +39,7 @@ exception statement from your version. */ package org.omg.PortableServer.POAPackage; import gnu.CORBA.EmptyExceptionHolder; +import gnu.CORBA.Minor; import org.omg.CORBA.Any; import org.omg.CORBA.BAD_OPERATION; @@ -106,6 +107,7 @@ public abstract class ObjectNotActiveHelper catch (ClassCastException cex) { BAD_OPERATION bad = new BAD_OPERATION("ObjectNotActive expected"); + bad.minor = Minor.Any; bad.initCause(cex); throw bad; } diff --git a/org/omg/PortableServer/POAPackage/ServantAlreadyActiveHelper.java b/org/omg/PortableServer/POAPackage/ServantAlreadyActiveHelper.java index 0db0e938b..a74e67401 100644 --- a/org/omg/PortableServer/POAPackage/ServantAlreadyActiveHelper.java +++ b/org/omg/PortableServer/POAPackage/ServantAlreadyActiveHelper.java @@ -39,6 +39,7 @@ exception statement from your version. */ package org.omg.PortableServer.POAPackage; import gnu.CORBA.EmptyExceptionHolder; +import gnu.CORBA.Minor; import org.omg.CORBA.Any; import org.omg.CORBA.BAD_OPERATION; @@ -107,6 +108,7 @@ public abstract class ServantAlreadyActiveHelper catch (ClassCastException cex) { BAD_OPERATION bad = new BAD_OPERATION("ServantAlreadyActive expected"); + bad.minor = Minor.Any; bad.initCause(cex); throw bad; } diff --git a/org/omg/PortableServer/POAPackage/ServantNotActiveHelper.java b/org/omg/PortableServer/POAPackage/ServantNotActiveHelper.java index 429421853..5fb52cf35 100644 --- a/org/omg/PortableServer/POAPackage/ServantNotActiveHelper.java +++ b/org/omg/PortableServer/POAPackage/ServantNotActiveHelper.java @@ -39,6 +39,7 @@ exception statement from your version. */ package org.omg.PortableServer.POAPackage; import gnu.CORBA.EmptyExceptionHolder; +import gnu.CORBA.Minor; import org.omg.CORBA.Any; import org.omg.CORBA.BAD_OPERATION; @@ -106,6 +107,7 @@ public abstract class ServantNotActiveHelper catch (ClassCastException cex) { BAD_OPERATION bad = new BAD_OPERATION("ServantNotActive expected"); + bad.minor = Minor.Any; bad.initCause(cex); throw bad; } diff --git a/org/omg/PortableServer/POAPackage/WrongAdapterHelper.java b/org/omg/PortableServer/POAPackage/WrongAdapterHelper.java index ebba304a5..cd862b081 100644 --- a/org/omg/PortableServer/POAPackage/WrongAdapterHelper.java +++ b/org/omg/PortableServer/POAPackage/WrongAdapterHelper.java @@ -39,6 +39,7 @@ exception statement from your version. */ package org.omg.PortableServer.POAPackage; import gnu.CORBA.EmptyExceptionHolder; +import gnu.CORBA.Minor; import org.omg.CORBA.Any; import org.omg.CORBA.BAD_OPERATION; @@ -106,6 +107,7 @@ public abstract class WrongAdapterHelper catch (ClassCastException cex) { BAD_OPERATION bad = new BAD_OPERATION("WrongAdapter expected"); + bad.minor = Minor.Any; bad.initCause(cex); throw bad; } diff --git a/org/omg/PortableServer/POAPackage/WrongPolicyHelper.java b/org/omg/PortableServer/POAPackage/WrongPolicyHelper.java index 5460d0ea7..a1f27cbb0 100644 --- a/org/omg/PortableServer/POAPackage/WrongPolicyHelper.java +++ b/org/omg/PortableServer/POAPackage/WrongPolicyHelper.java @@ -39,6 +39,7 @@ exception statement from your version. */ package org.omg.PortableServer.POAPackage; import gnu.CORBA.EmptyExceptionHolder; +import gnu.CORBA.Minor; import org.omg.CORBA.Any; import org.omg.CORBA.BAD_OPERATION; @@ -106,6 +107,7 @@ public abstract class WrongPolicyHelper catch (ClassCastException cex) { BAD_OPERATION bad = new BAD_OPERATION("WrongPolicy expected"); + bad.minor = Minor.Any; bad.initCause(cex); throw bad; } diff --git a/org/omg/PortableServer/RequestProcessingPolicyValue.java b/org/omg/PortableServer/RequestProcessingPolicyValue.java index 139010c86..0b1ce4d0b 100644 --- a/org/omg/PortableServer/RequestProcessingPolicyValue.java +++ b/org/omg/PortableServer/RequestProcessingPolicyValue.java @@ -38,6 +38,8 @@ exception statement from your version. */ package org.omg.PortableServer; +import gnu.CORBA.Minor; + import org.omg.CORBA.BAD_OPERATION; import org.omg.CORBA.portable.IDLEntity; @@ -151,7 +153,9 @@ public class RequestProcessingPolicyValue } catch (ArrayIndexOutOfBoundsException ex) { - throw new BAD_OPERATION("Invalid enumeration code " + code); + BAD_OPERATION bad = new BAD_OPERATION("Invalid policy code " + code); + bad.minor = Minor.PolicyType; + throw bad; } } diff --git a/org/omg/PortableServer/Servant.java b/org/omg/PortableServer/Servant.java index 745fc8a7e..5c99ee1a0 100644 --- a/org/omg/PortableServer/Servant.java +++ b/org/omg/PortableServer/Servant.java @@ -45,6 +45,8 @@ import org.omg.CORBA.ORB; import org.omg.PortableServer.POAPackage.ServantNotActive; import org.omg.PortableServer.POAPackage.WrongPolicy; import org.omg.PortableServer.portable.Delegate; + +import gnu.CORBA.Minor; import gnu.CORBA.Poa.ORB_1_4; import gnu.CORBA.Poa.gnuPOA; @@ -239,6 +241,7 @@ public abstract class Servant catch (WrongPolicy unexp) { BAD_OPERATION bad = new BAD_OPERATION(); + bad.minor = Minor.Policy; bad.initCause(unexp); throw bad; } @@ -253,6 +256,7 @@ public abstract class Servant unexp.initCause(ex); BAD_OPERATION bad = new BAD_OPERATION(); + bad.minor = Minor.Activation; bad.initCause(unexp); throw bad; } diff --git a/org/omg/PortableServer/ServantLocatorHelper.java b/org/omg/PortableServer/ServantLocatorHelper.java index 495e06cd2..2195e7899 100644 --- a/org/omg/PortableServer/ServantLocatorHelper.java +++ b/org/omg/PortableServer/ServantLocatorHelper.java @@ -110,6 +110,7 @@ public abstract class ServantLocatorHelper catch (ClassCastException ex) { BAD_OPERATION bad = new BAD_OPERATION(); + bad.minor = Minor.ClassCast; bad.initCause(ex); throw bad; } diff --git a/org/omg/PortableServer/ServantRetentionPolicyValue.java b/org/omg/PortableServer/ServantRetentionPolicyValue.java index caf8132e6..0b6ecf62f 100644 --- a/org/omg/PortableServer/ServantRetentionPolicyValue.java +++ b/org/omg/PortableServer/ServantRetentionPolicyValue.java @@ -38,6 +38,8 @@ exception statement from your version. */ package org.omg.PortableServer; +import gnu.CORBA.Minor; + import org.omg.CORBA.BAD_OPERATION; import org.omg.CORBA.portable.IDLEntity; @@ -126,7 +128,9 @@ public class ServantRetentionPolicyValue } catch (ArrayIndexOutOfBoundsException ex) { - throw new BAD_OPERATION("Invalid enumeration code " + code); + BAD_OPERATION bad = new BAD_OPERATION("Invalid policy code " + code); + bad.minor = Minor.PolicyType; + throw bad; } } diff --git a/org/omg/PortableServer/ThreadPolicyValue.java b/org/omg/PortableServer/ThreadPolicyValue.java index c7d4d6367..5c771a7d6 100644 --- a/org/omg/PortableServer/ThreadPolicyValue.java +++ b/org/omg/PortableServer/ThreadPolicyValue.java @@ -38,6 +38,8 @@ exception statement from your version. */ package org.omg.PortableServer; +import gnu.CORBA.Minor; + import org.omg.CORBA.BAD_OPERATION; import org.omg.CORBA.portable.IDLEntity; @@ -139,7 +141,9 @@ public class ThreadPolicyValue } catch (ArrayIndexOutOfBoundsException ex) { - throw new BAD_OPERATION("Invalid enumeration code " + code); + BAD_OPERATION bad = new BAD_OPERATION("Invalid policy code " + code); + bad.minor = Minor.PolicyType; + throw bad; } } |