diff options
Diffstat (limited to 'org/omg/PortableServer')
23 files changed, 74 insertions, 10 deletions
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; } } |