[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[cp-patches] FYI: Exception minor codes for BAD_OPERATION and NO_RESOURC
|
From: |
Meskauskas Audrius |
|
Subject: |
[cp-patches] FYI: Exception minor codes for BAD_OPERATION and NO_RESOURCES |
|
Date: |
Wed, 05 Oct 2005 18:20:03 +0200 |
|
User-agent: |
Mozilla Thunderbird 1.0.2 (Windows/20050317) |
2005-10-05 Audrius Meskauskas <address@hidden>
* 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.
Index: gnu/CORBA/EmptyExceptionHolder.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/CORBA/EmptyExceptionHolder.java,v
retrieving revision 1.2
diff -u -r1.2 EmptyExceptionHolder.java
--- gnu/CORBA/EmptyExceptionHolder.java 2 Jul 2005 20:32:08 -0000 1.2
+++ gnu/CORBA/EmptyExceptionHolder.java 5 Oct 2005 09:34:54 -0000
@@ -125,6 +125,7 @@
catch (Exception ex)
{
BAD_OPERATION bad = new BAD_OPERATION();
+ bad.minor = Minor.CDR;
bad.initCause(ex);
throw bad;
}
Index: gnu/CORBA/ForwardRequestHelper.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/CORBA/ForwardRequestHelper.java,v
retrieving revision 1.2
diff -u -r1.2 ForwardRequestHelper.java
--- gnu/CORBA/ForwardRequestHelper.java 24 Aug 2005 22:57:07 -0000 1.2
+++ gnu/CORBA/ForwardRequestHelper.java 5 Oct 2005 10:14:44 -0000
@@ -81,6 +81,7 @@
catch (ClassCastException cex)
{
BAD_OPERATION bad = new BAD_OPERATION("ForwardRequest expected");
+ bad.minor = Minor.Any;
bad.initCause(cex);
throw bad;
}
Index: gnu/CORBA/Functional_ORB.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/CORBA/Functional_ORB.java,v
retrieving revision 1.19
diff -u -r1.19 Functional_ORB.java
--- gnu/CORBA/Functional_ORB.java 2 Oct 2005 19:58:00 -0000 1.19
+++ gnu/CORBA/Functional_ORB.java 5 Oct 2005 15:37:26 -0000
@@ -148,6 +148,7 @@
{
BAD_OPERATION bad =
new BAD_OPERATION("Unable to open the server socket at "+s_port);
+ bad.minor = Minor.Socket;
bad.initCause(ex);
throw bad;
}
@@ -562,6 +563,7 @@
catch (IOException ex)
{
NO_RESOURCES bad = new NO_RESOURCES("Unable to open the server
socket.");
+ bad.minor = Minor.Ports;
bad.initCause(ex);
throw bad;
}
@@ -1484,7 +1486,11 @@
try
{
if (no_resources)
- throw new NO_RESOURCES();
+ {
+ NO_RESOURCES no = new NO_RESOURCES("Too many parallel
calls");
+ no.minor = Minor.Threads;
+ throw no;
+ }
if (target == null)
throw new OBJECT_NOT_EXIST();
target._invoke(rh_request.operation, cin, handler);
Index: gnu/CORBA/Minor.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/CORBA/Minor.java,v
retrieving revision 1.1
diff -u -r1.1 Minor.java
--- gnu/CORBA/Minor.java 4 Oct 2005 17:58:15 -0000 1.1
+++ gnu/CORBA/Minor.java 5 Oct 2005 15:41:40 -0000
@@ -38,7 +38,6 @@
package gnu.CORBA;
-import java.lang.reflect.Field;
/**
* Provides information and operations, related to about the 20 bit vendor
minor
@@ -51,6 +50,8 @@
{
// Note: MARSHAL done.
+ /* MARSHAL */
+
/**
* The GNU Classpath VMCID. The last 12 bits can be used to mark up to 4096
* possible exceptions.
@@ -105,7 +106,7 @@
/**
* The unexpected IOException while inserting or extracting data to/from the
- * Any.
+ * Any or DynamicAny.
*/
int Any = 9 | vendor;
@@ -213,4 +214,63 @@
* The instance of the value type is not serializable.
*/
int NonSerializable = 28 | vendor;
+
+ /* BAD_OPERATION */
+
+ /**
+ * The remote side requested to invoke the method that is not available on
+ * that target (client and server probably disagree in the object
definition).
+ */
+ int Method = 0 | vendor;
+
+ /**
+ * Failed to activate the inactive object.
+ */
+ int Activation = 10 | vendor;
+
+ /*
+ * Any - Attempt to extract from the Any value of the different type that was
+ * stored into that Any.
+ */
+
+ /* ClassCast - Unable to narrow the object into stub. */
+
+ /**
+ * The policies, applying to ORB or POA prevent the requested operation.
+ */
+ int Policy = 11 | vendor;
+
+ /**
+ * Socket related errors like failure to open socket on the expected port,
+ * failure to get a free port when required and so on.
+ */
+ int Socket = 12 | vendor;
+
+ /**
+ * The passed value for enumeration is outside the valid range for that
+ * enumeration.
+ */
+ int Enumeration = 14 | vendor;
+
+ /**
+ * The passed policy code is outside the valid range of the possible policies
+ * for the given policy type.
+ */
+ int PolicyType = 15 | vendor;
+
+ /* NO_RESOURCES */
+
+ /**
+ * Unable to get a free port for a new socket. Proably too many objects under
+ * unsuitable POA policy.
+ */
+ int Ports = 20 | vendor;
+
+ /**
+ * Too many parallel calls (too many parallel threads). The thread control
+ * prevents malicios client from knocking the server out by suddenly
+ * submitting large number of requests.
+ */
+ int Threads = 21 | vendor;
+
}
Index: gnu/CORBA/_PolicyImplBase.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/CORBA/_PolicyImplBase.java,v
retrieving revision 1.3
diff -u -r1.3 _PolicyImplBase.java
--- gnu/CORBA/_PolicyImplBase.java 2 Jul 2005 21:55:13 -0000 1.3
+++ gnu/CORBA/_PolicyImplBase.java 5 Oct 2005 09:30:14 -0000
@@ -165,7 +165,8 @@
output.write_long(policyCode);
}
else
- throw new BAD_OPERATION(method, 0, CompletionStatus.COMPLETED_MAYBE);
+ throw new BAD_OPERATION(method, Minor.Method,
+ CompletionStatus.COMPLETED_MAYBE);
return output;
}
Index: gnu/CORBA/gnuAny.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/CORBA/gnuAny.java,v
retrieving revision 1.9
diff -u -r1.9 gnuAny.java
--- gnu/CORBA/gnuAny.java 4 Oct 2005 17:58:15 -0000 1.9
+++ gnu/CORBA/gnuAny.java 5 Oct 2005 09:55:56 -0000
@@ -254,7 +254,10 @@
}
catch (ClassCastException ex)
{
- throw new BAD_OPERATION();
+ BAD_OPERATION bad = new BAD_OPERATION();
+ bad.initCause(ex);
+ bad.minor = Minor.Any;
+ throw bad;
}
}
@@ -319,7 +322,10 @@
}
catch (Exception ex)
{
- return new BAD_OPERATION("Value type expected");
+ BAD_OPERATION bad = new BAD_OPERATION("Value type expected");
+ bad.minor = Minor.Any;
+ bad.initCause(ex);
+ throw bad;
}
}
@@ -848,38 +854,43 @@
/**
* Check if the current value if the value of the given kind.
+ *
* @param kind a kind to check.
* @throws BAD_OPERATION if the value is not set of is different kind.
*/
protected void check(int kind)
- throws BAD_OPERATION
+ throws BAD_OPERATION
{
if (has == null)
- throw new BAD_OPERATION("value not set");
+ {
+ BAD_OPERATION bad = new BAD_OPERATION("value not set");
+ bad.minor = Minor.Any;
+ throw bad;
+ }
if (xKind >= 0)
{
if (xKind != kind)
- if (!(
- xKind == TCKind._tk_alias &&
- has._type().kind().value() == kind
- )
- )
- throw new BAD_OPERATION("Extracting " + typeNamer.nameIt(kind) +
- " when stored " + typeNamer.nameIt(xKind)
- );
+ if (!(xKind == TCKind._tk_alias && has._type().kind().value() ==
kind))
+ {
+ BAD_OPERATION bad = new BAD_OPERATION("Extracting "
+ + typeNamer.nameIt(kind) + " when stored "
+ + typeNamer.nameIt(xKind));
+ bad.minor = Minor.Any;
+ throw bad;
+ }
}
else
{
if (type().kind().value() != kind)
- if (!(
- type().kind().value() == TCKind._tk_alias &&
- has._type().kind().value() == kind
- )
- )
- throw new BAD_OPERATION("Extracting " + typeNamer.nameIt(kind) +
- " stored " + typeNamer.nameIt(type())
- );
+ if (!(type().kind().value() == TCKind._tk_alias &&
has._type().kind().value() == kind))
+ {
+ BAD_OPERATION bad = new BAD_OPERATION("Extracting "
+ + typeNamer.nameIt(kind) + " stored "
+ + typeNamer.nameIt(type()));
+ bad.minor = Minor.Any;
+ throw bad;
+ }
}
}
Index: gnu/CORBA/universalHolder.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/CORBA/universalHolder.java,v
retrieving revision 1.5
diff -u -r1.5 universalHolder.java
--- gnu/CORBA/universalHolder.java 4 Oct 2005 17:58:15 -0000 1.5
+++ gnu/CORBA/universalHolder.java 5 Oct 2005 09:35:26 -0000
@@ -123,7 +123,9 @@
*/
public TypeCode _type()
{
- throw new BAD_OPERATION();
+ BAD_OPERATION bad = new BAD_OPERATION();
+ bad.minor = Minor.Inappropriate;
+ throw bad;
}
/**
Index: gnu/CORBA/CDR/cdrInput.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/CORBA/CDR/cdrInput.java,v
retrieving revision 1.11
diff -u -r1.11 cdrInput.java
--- gnu/CORBA/CDR/cdrInput.java 4 Oct 2005 17:58:14 -0000 1.11
+++ gnu/CORBA/CDR/cdrInput.java 5 Oct 2005 09:33:24 -0000
@@ -442,7 +442,8 @@
}
catch (IOException ex)
{
- BAD_OPERATION bad = new BAD_OPERATION();
+ MARSHAL bad = new MARSHAL();
+ bad.minor = Minor.IOR;
bad.initCause(ex);
throw bad;
}
Index: gnu/CORBA/Poa/gnuServantObject.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/CORBA/Poa/gnuServantObject.java,v
retrieving revision 1.3
diff -u -r1.3 gnuServantObject.java
--- gnu/CORBA/Poa/gnuServantObject.java 2 Oct 2005 19:58:01 -0000 1.3
+++ gnu/CORBA/Poa/gnuServantObject.java 5 Oct 2005 09:27:04 -0000
@@ -44,6 +44,7 @@
import gnu.CORBA.Interceptor.gnuServerRequestInfo;
import gnu.CORBA.IOR;
import gnu.CORBA.IorProvider;
+import gnu.CORBA.Minor;
import gnu.CORBA.ObjectCreator;
import gnu.CORBA.Unexpected;
import gnu.CORBA.bufferedResponseHandler;
@@ -268,10 +269,8 @@
}
catch (Exception ex)
{
- ex.printStackTrace();
-
BAD_OPERATION bad =
- new BAD_OPERATION("Unable to activate", 0x5004,
+ new BAD_OPERATION("Unable to activate", Minor.Activation,
CompletionStatus.COMPLETED_NO
);
bad.initCause(ex);
@@ -287,7 +286,7 @@
// No servant and no servant manager - throw exception.
else
{
- throw new BAD_OPERATION("Unable to activate", 0x5002,
+ throw new BAD_OPERATION("Unable to activate", Minor.Activation,
CompletionStatus.COMPLETED_NO
);
}
Index: org/omg/CORBA/BAD_OPERATION.java
===================================================================
RCS file: /cvsroot/classpath/classpath/org/omg/CORBA/BAD_OPERATION.java,v
retrieving revision 1.5
diff -u -r1.5 BAD_OPERATION.java
--- org/omg/CORBA/BAD_OPERATION.java 2 Jul 2005 20:32:55 -0000 1.5
+++ org/omg/CORBA/BAD_OPERATION.java 5 Oct 2005 15:13:16 -0000
@@ -41,8 +41,76 @@
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 (address@hidden)
*/
@@ -50,14 +118,15 @@
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 @@
}
/**
- * 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 @@
/**
* Created BAD_OPERATION exception, providing full information.
+ *
* @param reason explaining message.
* @param minor additional error code (the "minor").
* @param completed the method completion status.
Index: org/omg/CORBA/CompletionStatus.java
===================================================================
RCS file: /cvsroot/classpath/classpath/org/omg/CORBA/CompletionStatus.java,v
retrieving revision 1.8
diff -u -r1.8 CompletionStatus.java
--- org/omg/CORBA/CompletionStatus.java 2 Jul 2005 20:32:55 -0000 1.8
+++ org/omg/CORBA/CompletionStatus.java 5 Oct 2005 09:57:44 -0000
@@ -38,6 +38,8 @@
package org.omg.CORBA;
+import gnu.CORBA.Minor;
+
import java.io.Serializable;
import org.omg.CORBA.portable.IDLEntity;
@@ -108,6 +110,7 @@
/**
* 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 @@
{
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;
}
}
Index: org/omg/CORBA/MARSHAL.java
===================================================================
RCS file: /cvsroot/classpath/classpath/org/omg/CORBA/MARSHAL.java,v
retrieving revision 1.5
diff -u -r1.5 MARSHAL.java
--- org/omg/CORBA/MARSHAL.java 4 Oct 2005 17:58:15 -0000 1.5
+++ org/omg/CORBA/MARSHAL.java 5 Oct 2005 10:33:32 -0000
@@ -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 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.
-
- 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. */
+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.
+
+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.
+
+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;
Index: org/omg/CORBA/NO_RESOURCES.java
===================================================================
RCS file: /cvsroot/classpath/classpath/org/omg/CORBA/NO_RESOURCES.java,v
retrieving revision 1.2
diff -u -r1.2 NO_RESOURCES.java
--- org/omg/CORBA/NO_RESOURCES.java 2 Jul 2005 20:32:57 -0000 1.2
+++ org/omg/CORBA/NO_RESOURCES.java 5 Oct 2005 16:01:24 -0000
@@ -41,9 +41,39 @@
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 (address@hidden)
*/
public class NO_RESOURCES
@@ -56,8 +86,9 @@
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 @@
}
/**
- * 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);
}
}
Index: org/omg/CORBA/NameValuePairHelper.java
===================================================================
RCS file: /cvsroot/classpath/classpath/org/omg/CORBA/NameValuePairHelper.java,v
retrieving revision 1.2
diff -u -r1.2 NameValuePairHelper.java
--- org/omg/CORBA/NameValuePairHelper.java 2 Jul 2005 20:32:57 -0000
1.2
+++ org/omg/CORBA/NameValuePairHelper.java 5 Oct 2005 09:58:16 -0000
@@ -39,6 +39,7 @@
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 @@
}
catch (ClassCastException ex)
{
- throw new BAD_OPERATION("NameValuePair expected");
+ BAD_OPERATION bad = new BAD_OPERATION("NameValuePair expected");
+ bad.minor = Minor.Any;
+ throw bad;
}
}
Index: org/omg/CORBA/ObjectHelper.java
===================================================================
RCS file: /cvsroot/classpath/classpath/org/omg/CORBA/ObjectHelper.java,v
retrieving revision 1.3
diff -u -r1.3 ObjectHelper.java
--- org/omg/CORBA/ObjectHelper.java 7 Aug 2005 17:17:43 -0000 1.3
+++ org/omg/CORBA/ObjectHelper.java 5 Oct 2005 09:58:46 -0000
@@ -38,6 +38,7 @@
package org.omg.CORBA;
+import gnu.CORBA.Minor;
import gnu.CORBA.primitiveTypeCode;
import org.omg.CORBA.portable.InputStream;
@@ -63,7 +64,9 @@
}
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;
}
}
Index: org/omg/CORBA/PolicyHelper.java
===================================================================
RCS file: /cvsroot/classpath/classpath/org/omg/CORBA/PolicyHelper.java,v
retrieving revision 1.3
diff -u -r1.3 PolicyHelper.java
--- org/omg/CORBA/PolicyHelper.java 2 Jul 2005 21:55:14 -0000 1.3
+++ org/omg/CORBA/PolicyHelper.java 5 Oct 2005 09:59:30 -0000
@@ -38,6 +38,8 @@
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 @@
}
catch (ClassCastException ex)
{
- throw new BAD_OPERATION("Policy expected");
+ BAD_OPERATION bad = new BAD_OPERATION("Policy expected");
+ bad.minor = Minor.Any;
+ throw bad;
}
}
Index: org/omg/CORBA/PolicyListHelper.java
===================================================================
RCS file: /cvsroot/classpath/classpath/org/omg/CORBA/PolicyListHelper.java,v
retrieving revision 1.2
diff -u -r1.2 PolicyListHelper.java
--- org/omg/CORBA/PolicyListHelper.java 2 Jul 2005 20:32:57 -0000 1.2
+++ org/omg/CORBA/PolicyListHelper.java 5 Oct 2005 09:59:54 -0000
@@ -38,6 +38,8 @@
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 @@
}
catch (ClassCastException ex)
{
- throw new BAD_OPERATION("Policy[] expected");
+ BAD_OPERATION bad = new BAD_OPERATION("Policy[] expected");
+ bad.minor = Minor.Any;
+ throw bad;
}
}
Index: org/omg/CORBA/ServiceDetailHelper.java
===================================================================
RCS file: /cvsroot/classpath/classpath/org/omg/CORBA/ServiceDetailHelper.java,v
retrieving revision 1.3
diff -u -r1.3 ServiceDetailHelper.java
--- org/omg/CORBA/ServiceDetailHelper.java 28 Aug 2005 11:23:36 -0000
1.3
+++ org/omg/CORBA/ServiceDetailHelper.java 5 Oct 2005 10:14:44 -0000
@@ -38,6 +38,7 @@
package org.omg.CORBA;
+import gnu.CORBA.Minor;
import gnu.CORBA.ServiceDetailHolder;
import org.omg.CORBA.portable.InputStream;
@@ -78,7 +79,10 @@
}
catch (ClassCastException ex)
{
- throw new BAD_OPERATION();
+ BAD_OPERATION bad = new BAD_OPERATION();
+ bad.initCause(ex);
+ bad.minor = Minor.Any;
+ throw bad;
}
}
Index: org/omg/CORBA/StringValueHelper.java
===================================================================
RCS file: /cvsroot/classpath/classpath/org/omg/CORBA/StringValueHelper.java,v
retrieving revision 1.4
diff -u -r1.4 StringValueHelper.java
--- org/omg/CORBA/StringValueHelper.java 4 Oct 2005 17:58:15 -0000
1.4
+++ org/omg/CORBA/StringValueHelper.java 5 Oct 2005 10:00:34 -0000
@@ -142,7 +142,11 @@
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;
+ }
}
/**
Index: org/omg/CORBA/WStringValueHelper.java
===================================================================
RCS file: /cvsroot/classpath/classpath/org/omg/CORBA/WStringValueHelper.java,v
retrieving revision 1.4
diff -u -r1.4 WStringValueHelper.java
--- org/omg/CORBA/WStringValueHelper.java 4 Oct 2005 17:58:15 -0000
1.4
+++ org/omg/CORBA/WStringValueHelper.java 5 Oct 2005 10:00:58 -0000
@@ -142,7 +142,11 @@
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;
+ }
}
/**
Index: org/omg/CosNaming/BindingHelper.java
===================================================================
RCS file: /cvsroot/classpath/classpath/org/omg/CosNaming/BindingHelper.java,v
retrieving revision 1.2
diff -u -r1.2 BindingHelper.java
--- org/omg/CosNaming/BindingHelper.java 2 Jul 2005 20:32:59 -0000
1.2
+++ org/omg/CosNaming/BindingHelper.java 5 Oct 2005 10:14:44 -0000
@@ -38,6 +38,8 @@
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 @@
}
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;
}
}
Index: org/omg/CosNaming/BindingIteratorHelper.java
===================================================================
RCS file:
/cvsroot/classpath/classpath/org/omg/CosNaming/BindingIteratorHelper.java,v
retrieving revision 1.3
diff -u -r1.3 BindingIteratorHelper.java
--- org/omg/CosNaming/BindingIteratorHelper.java 2 Jul 2005 20:32:59
-0000 1.3
+++ org/omg/CosNaming/BindingIteratorHelper.java 5 Oct 2005 10:14:46
-0000
@@ -38,6 +38,8 @@
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 @@
{
BAD_OPERATION bad = new BAD_OPERATION("Binding iterator expected");
bad.initCause(ex);
+ bad.minor = Minor.Any;
throw bad;
}
}
Index: org/omg/CosNaming/BindingIteratorPOA.java
===================================================================
RCS file:
/cvsroot/classpath/classpath/org/omg/CosNaming/BindingIteratorPOA.java,v
retrieving revision 1.1
diff -u -r1.1 BindingIteratorPOA.java
--- org/omg/CosNaming/BindingIteratorPOA.java 2 Sep 2005 19:44:00 -0000
1.1
+++ org/omg/CosNaming/BindingIteratorPOA.java 5 Oct 2005 09:31:06 -0000
@@ -38,6 +38,8 @@
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 @@
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;
}
Index: org/omg/CosNaming/BindingTypeHelper.java
===================================================================
RCS file:
/cvsroot/classpath/classpath/org/omg/CosNaming/BindingTypeHelper.java,v
retrieving revision 1.3
diff -u -r1.3 BindingTypeHelper.java
--- org/omg/CosNaming/BindingTypeHelper.java 2 Jul 2005 20:32:59 -0000
1.3
+++ org/omg/CosNaming/BindingTypeHelper.java 5 Oct 2005 10:14:46 -0000
@@ -38,6 +38,8 @@
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 @@
{
BAD_OPERATION bad = new BAD_OPERATION("Binding type expected");
bad.initCause(ex);
+ bad.minor = Minor.Any;
throw bad;
}
}
Index: org/omg/CosNaming/NameComponentHelper.java
===================================================================
RCS file:
/cvsroot/classpath/classpath/org/omg/CosNaming/NameComponentHelper.java,v
retrieving revision 1.3
diff -u -r1.3 NameComponentHelper.java
--- org/omg/CosNaming/NameComponentHelper.java 2 Jul 2005 20:32:59 -0000
1.3
+++ org/omg/CosNaming/NameComponentHelper.java 5 Oct 2005 10:14:46 -0000
@@ -38,6 +38,8 @@
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 @@
{
BAD_OPERATION bad = new BAD_OPERATION("Name component expected");
bad.initCause(ex);
+ bad.minor = Minor.Any;
throw bad;
}
}
Index: org/omg/CosNaming/NameHelper.java
===================================================================
RCS file: /cvsroot/classpath/classpath/org/omg/CosNaming/NameHelper.java,v
retrieving revision 1.3
diff -u -r1.3 NameHelper.java
--- org/omg/CosNaming/NameHelper.java 2 Jul 2005 20:32:59 -0000 1.3
+++ org/omg/CosNaming/NameHelper.java 5 Oct 2005 10:14:46 -0000
@@ -38,6 +38,8 @@
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 @@
{
BAD_OPERATION bad = new BAD_OPERATION("Name expected");
bad.initCause(ex);
+ bad.minor = Minor.Any;
throw bad;
}
}
Index: org/omg/CosNaming/NamingContextExtHelper.java
===================================================================
RCS file:
/cvsroot/classpath/classpath/org/omg/CosNaming/NamingContextExtHelper.java,v
retrieving revision 1.3
diff -u -r1.3 NamingContextExtHelper.java
--- org/omg/CosNaming/NamingContextExtHelper.java 2 Jul 2005 20:32:59
-0000 1.3
+++ org/omg/CosNaming/NamingContextExtHelper.java 5 Oct 2005 10:14:46
-0000
@@ -38,6 +38,8 @@
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 @@
{
BAD_OPERATION bad = new BAD_OPERATION("NamingContextExt expected");
bad.initCause(ex);
+ bad.minor = Minor.Any;
throw bad;
}
}
Index: org/omg/CosNaming/NamingContextExtPOA.java
===================================================================
RCS file:
/cvsroot/classpath/classpath/org/omg/CosNaming/NamingContextExtPOA.java,v
retrieving revision 1.1
diff -u -r1.1 NamingContextExtPOA.java
--- org/omg/CosNaming/NamingContextExtPOA.java 2 Sep 2005 19:44:00 -0000
1.1
+++ org/omg/CosNaming/NamingContextExtPOA.java 5 Oct 2005 10:14:44 -0000
@@ -38,6 +38,8 @@
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 @@
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())
{
Index: org/omg/CosNaming/NamingContextHelper.java
===================================================================
RCS file:
/cvsroot/classpath/classpath/org/omg/CosNaming/NamingContextHelper.java,v
retrieving revision 1.3
diff -u -r1.3 NamingContextHelper.java
--- org/omg/CosNaming/NamingContextHelper.java 2 Jul 2005 20:32:59 -0000
1.3
+++ org/omg/CosNaming/NamingContextHelper.java 5 Oct 2005 10:03:10 -0000
@@ -38,6 +38,8 @@
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 @@
{
BAD_OPERATION bad = new BAD_OPERATION("Naming context expected");
bad.initCause(ex);
+ bad.minor = Minor.Any;
throw bad;
}
}
Index: org/omg/CosNaming/NamingContextPOA.java
===================================================================
RCS file: /cvsroot/classpath/classpath/org/omg/CosNaming/NamingContextPOA.java,v
retrieving revision 1.1
diff -u -r1.1 NamingContextPOA.java
--- org/omg/CosNaming/NamingContextPOA.java 2 Sep 2005 19:44:00 -0000
1.1
+++ org/omg/CosNaming/NamingContextPOA.java 5 Oct 2005 09:32:34 -0000
@@ -38,6 +38,8 @@
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 @@
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())
{
Index: org/omg/CosNaming/_BindingIteratorImplBase.java
===================================================================
RCS file:
/cvsroot/classpath/classpath/org/omg/CosNaming/_BindingIteratorImplBase.java,v
retrieving revision 1.4
diff -u -r1.4 _BindingIteratorImplBase.java
--- org/omg/CosNaming/_BindingIteratorImplBase.java 2 Jul 2005 20:32:59
-0000 1.4
+++ org/omg/CosNaming/_BindingIteratorImplBase.java 5 Oct 2005 09:31:12
-0000
@@ -38,6 +38,8 @@
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 @@
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;
}
Index: org/omg/CosNaming/_NamingContextImplBase.java
===================================================================
RCS file:
/cvsroot/classpath/classpath/org/omg/CosNaming/_NamingContextImplBase.java,v
retrieving revision 1.5
diff -u -r1.5 _NamingContextImplBase.java
--- org/omg/CosNaming/_NamingContextImplBase.java 2 Sep 2005 19:44:00
-0000 1.5
+++ org/omg/CosNaming/_NamingContextImplBase.java 5 Oct 2005 10:14:44
-0000
@@ -38,6 +38,8 @@
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 @@
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 @@
// 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())
{
Index: org/omg/CosNaming/NamingContextPackage/AlreadyBoundHelper.java
===================================================================
RCS file:
/cvsroot/classpath/classpath/org/omg/CosNaming/NamingContextPackage/AlreadyBoundHelper.java,v
retrieving revision 1.2
diff -u -r1.2 AlreadyBoundHelper.java
--- org/omg/CosNaming/NamingContextPackage/AlreadyBoundHelper.java 2 Jul
2005 20:33:00 -0000 1.2
+++ org/omg/CosNaming/NamingContextPackage/AlreadyBoundHelper.java 5 Oct
2005 10:14:44 -0000
@@ -38,6 +38,8 @@
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 @@
}
catch (ClassCastException ex)
{
- throw new BAD_OPERATION();
+ BAD_OPERATION bad = new BAD_OPERATION();
+ bad.initCause(ex);
+ bad.minor = Minor.Any;
+ throw bad;
}
}
Index: org/omg/CosNaming/NamingContextPackage/CannotProceedHelper.java
===================================================================
RCS file:
/cvsroot/classpath/classpath/org/omg/CosNaming/NamingContextPackage/CannotProceedHelper.java,v
retrieving revision 1.2
diff -u -r1.2 CannotProceedHelper.java
--- org/omg/CosNaming/NamingContextPackage/CannotProceedHelper.java 2 Jul
2005 20:33:00 -0000 1.2
+++ org/omg/CosNaming/NamingContextPackage/CannotProceedHelper.java 5 Oct
2005 10:14:44 -0000
@@ -38,6 +38,8 @@
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 @@
}
catch (ClassCastException ex)
{
- throw new BAD_OPERATION();
+ BAD_OPERATION bad = new BAD_OPERATION();
+ bad.initCause(ex);
+ bad.minor = Minor.Any;
+ throw bad;
}
}
Index: org/omg/CosNaming/NamingContextPackage/InvalidNameHelper.java
===================================================================
RCS file:
/cvsroot/classpath/classpath/org/omg/CosNaming/NamingContextPackage/InvalidNameHelper.java,v
retrieving revision 1.2
diff -u -r1.2 InvalidNameHelper.java
--- org/omg/CosNaming/NamingContextPackage/InvalidNameHelper.java 2 Jul
2005 20:33:00 -0000 1.2
+++ org/omg/CosNaming/NamingContextPackage/InvalidNameHelper.java 5 Oct
2005 10:14:44 -0000
@@ -38,6 +38,8 @@
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 @@
}
catch (ClassCastException ex)
{
- throw new BAD_OPERATION();
+ BAD_OPERATION bad = new BAD_OPERATION();
+ bad.initCause(ex);
+ bad.minor = Minor.Any;
+ throw bad;
}
}
Index: org/omg/CosNaming/NamingContextPackage/NotEmptyHelper.java
===================================================================
RCS file:
/cvsroot/classpath/classpath/org/omg/CosNaming/NamingContextPackage/NotEmptyHelper.java,v
retrieving revision 1.2
diff -u -r1.2 NotEmptyHelper.java
--- org/omg/CosNaming/NamingContextPackage/NotEmptyHelper.java 2 Jul 2005
20:33:00 -0000 1.2
+++ org/omg/CosNaming/NamingContextPackage/NotEmptyHelper.java 5 Oct 2005
10:14:44 -0000
@@ -38,6 +38,8 @@
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 @@
}
catch (ClassCastException ex)
{
- throw new BAD_OPERATION();
+ BAD_OPERATION bad = new BAD_OPERATION();
+ bad.initCause(ex);
+ bad.minor = Minor.Any;
+ throw bad;
}
}
Index: org/omg/CosNaming/NamingContextPackage/NotFoundHelper.java
===================================================================
RCS file:
/cvsroot/classpath/classpath/org/omg/CosNaming/NamingContextPackage/NotFoundHelper.java,v
retrieving revision 1.2
diff -u -r1.2 NotFoundHelper.java
--- org/omg/CosNaming/NamingContextPackage/NotFoundHelper.java 2 Jul 2005
20:33:00 -0000 1.2
+++ org/omg/CosNaming/NamingContextPackage/NotFoundHelper.java 5 Oct 2005
10:14:44 -0000
@@ -38,6 +38,8 @@
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 @@
}
catch (ClassCastException ex)
{
- throw new BAD_OPERATION();
+ BAD_OPERATION bad = new BAD_OPERATION();
+ bad.initCause(ex);
+ bad.minor = Minor.Any;
+ throw bad;
}
}
Index: org/omg/CosNaming/NamingContextPackage/NotFoundReasonHelper.java
===================================================================
RCS file:
/cvsroot/classpath/classpath/org/omg/CosNaming/NamingContextPackage/NotFoundReasonHelper.java,v
retrieving revision 1.2
diff -u -r1.2 NotFoundReasonHelper.java
--- org/omg/CosNaming/NamingContextPackage/NotFoundReasonHelper.java 2 Jul
2005 20:33:00 -0000 1.2
+++ org/omg/CosNaming/NamingContextPackage/NotFoundReasonHelper.java 5 Oct
2005 10:14:44 -0000
@@ -38,6 +38,8 @@
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 @@
}
catch (ClassCastException ex)
{
- throw new BAD_OPERATION();
+ BAD_OPERATION bad = new BAD_OPERATION();
+ bad.initCause(ex);
+ bad.minor = Minor.Any;
+ throw bad;
}
}
Index: org/omg/DynamicAny/DynAnySeqHelper.java
===================================================================
RCS file: /cvsroot/classpath/classpath/org/omg/DynamicAny/DynAnySeqHelper.java,v
retrieving revision 1.1
diff -u -r1.1 DynAnySeqHelper.java
--- org/omg/DynamicAny/DynAnySeqHelper.java 7 Aug 2005 22:00:20 -0000
1.1
+++ org/omg/DynamicAny/DynAnySeqHelper.java 5 Oct 2005 10:14:46 -0000
@@ -39,6 +39,7 @@
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 @@
{
BAD_OPERATION bad = new BAD_OPERATION("DynAnySeq expected");
bad.initCause(cex);
+ bad.minor = Minor.Any;
throw bad;
}
}
Index: org/omg/DynamicAny/NameDynAnyPairHelper.java
===================================================================
RCS file:
/cvsroot/classpath/classpath/org/omg/DynamicAny/NameDynAnyPairHelper.java,v
retrieving revision 1.1
diff -u -r1.1 NameDynAnyPairHelper.java
--- org/omg/DynamicAny/NameDynAnyPairHelper.java 7 Aug 2005 22:00:20
-0000 1.1
+++ org/omg/DynamicAny/NameDynAnyPairHelper.java 5 Oct 2005 10:14:46
-0000
@@ -38,6 +38,7 @@
package org.omg.DynamicAny;
+import gnu.CORBA.Minor;
import gnu.CORBA.NameDynAnyPairHolder;
import org.omg.CORBA.Any;
@@ -83,6 +84,7 @@
{
BAD_OPERATION bad = new BAD_OPERATION("NameDynAnyPair expected");
bad.initCause(cex);
+ bad.minor = Minor.Any;
throw bad;
}
}
Index: org/omg/DynamicAny/NameDynAnyPairSeqHelper.java
===================================================================
RCS file:
/cvsroot/classpath/classpath/org/omg/DynamicAny/NameDynAnyPairSeqHelper.java,v
retrieving revision 1.2
diff -u -r1.2 NameDynAnyPairSeqHelper.java
--- org/omg/DynamicAny/NameDynAnyPairSeqHelper.java 28 Aug 2005 11:23:36
-0000 1.2
+++ org/omg/DynamicAny/NameDynAnyPairSeqHelper.java 5 Oct 2005 10:14:46
-0000
@@ -38,6 +38,7 @@
package org.omg.DynamicAny;
+import gnu.CORBA.Minor;
import gnu.CORBA.NameDynAnyPairSeqHolder;
import org.omg.CORBA.Any;
@@ -105,6 +106,7 @@
{
BAD_OPERATION bad = new BAD_OPERATION("NameDynAnyPairSeq expected");
bad.initCause(cex);
+ bad.minor = Minor.Any;
throw bad;
}
}
Index: org/omg/DynamicAny/NameValuePairHelper.java
===================================================================
RCS file:
/cvsroot/classpath/classpath/org/omg/DynamicAny/NameValuePairHelper.java,v
retrieving revision 1.1
diff -u -r1.1 NameValuePairHelper.java
--- org/omg/DynamicAny/NameValuePairHelper.java 7 Aug 2005 22:00:20 -0000
1.1
+++ org/omg/DynamicAny/NameValuePairHelper.java 5 Oct 2005 10:14:46 -0000
@@ -38,6 +38,7 @@
package org.omg.DynamicAny;
+import gnu.CORBA.Minor;
import gnu.CORBA.NameValuePairHolder;
import org.omg.CORBA.Any;
@@ -118,6 +119,7 @@
{
BAD_OPERATION bad = new BAD_OPERATION("NameValuePair expected");
bad.initCause(cex);
+ bad.minor = Minor.Any;
throw bad;
}
}
Index: org/omg/DynamicAny/NameValuePairSeqHelper.java
===================================================================
RCS file:
/cvsroot/classpath/classpath/org/omg/DynamicAny/NameValuePairSeqHelper.java,v
retrieving revision 1.1
diff -u -r1.1 NameValuePairSeqHelper.java
--- org/omg/DynamicAny/NameValuePairSeqHelper.java 7 Aug 2005 22:00:20
-0000 1.1
+++ org/omg/DynamicAny/NameValuePairSeqHelper.java 5 Oct 2005 10:04:58
-0000
@@ -38,6 +38,7 @@
package org.omg.DynamicAny;
+import gnu.CORBA.Minor;
import gnu.CORBA.NameValuePairSeqHolder;
import org.omg.CORBA.Any;
@@ -98,6 +99,7 @@
{
BAD_OPERATION bad = new BAD_OPERATION("NameValuePairSeq expected");
bad.initCause(cex);
+ bad.minor = Minor.Any;
throw bad;
}
}
Index: org/omg/DynamicAny/DynAnyFactoryPackage/InconsistentTypeCodeHelper.java
===================================================================
RCS file:
/cvsroot/classpath/classpath/org/omg/DynamicAny/DynAnyFactoryPackage/InconsistentTypeCodeHelper.java,v
retrieving revision 1.2
diff -u -r1.2 InconsistentTypeCodeHelper.java
--- org/omg/DynamicAny/DynAnyFactoryPackage/InconsistentTypeCodeHelper.java
2 Jul 2005 20:33:00 -0000 1.2
+++ org/omg/DynamicAny/DynAnyFactoryPackage/InconsistentTypeCodeHelper.java
5 Oct 2005 10:14:46 -0000
@@ -39,6 +39,7 @@
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 @@
{
BAD_OPERATION bad = new BAD_OPERATION("InconsistentTypeCode expected");
bad.initCause(cex);
+ bad.minor = Minor.Any;
throw bad;
}
}
Index: org/omg/DynamicAny/DynAnyPackage/InvalidValueHelper.java
===================================================================
RCS file:
/cvsroot/classpath/classpath/org/omg/DynamicAny/DynAnyPackage/InvalidValueHelper.java,v
retrieving revision 1.2
diff -u -r1.2 InvalidValueHelper.java
--- org/omg/DynamicAny/DynAnyPackage/InvalidValueHelper.java 2 Jul 2005
20:33:00 -0000 1.2
+++ org/omg/DynamicAny/DynAnyPackage/InvalidValueHelper.java 5 Oct 2005
10:14:46 -0000
@@ -39,6 +39,7 @@
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 @@
{
BAD_OPERATION bad = new BAD_OPERATION("InvalidValue expected");
bad.initCause(cex);
+ bad.minor = Minor.Any;
throw bad;
}
}
Index: org/omg/DynamicAny/DynAnyPackage/TypeMismatchHelper.java
===================================================================
RCS file:
/cvsroot/classpath/classpath/org/omg/DynamicAny/DynAnyPackage/TypeMismatchHelper.java,v
retrieving revision 1.2
diff -u -r1.2 TypeMismatchHelper.java
--- org/omg/DynamicAny/DynAnyPackage/TypeMismatchHelper.java 2 Jul 2005
20:33:00 -0000 1.2
+++ org/omg/DynamicAny/DynAnyPackage/TypeMismatchHelper.java 5 Oct 2005
10:14:46 -0000
@@ -39,6 +39,7 @@
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 @@
{
BAD_OPERATION bad = new BAD_OPERATION("TypeMismatch expected");
bad.initCause(cex);
+ bad.minor = Minor.Any;
throw bad;
}
}
Index: org/omg/IOP/IORHelper.java
===================================================================
RCS file: /cvsroot/classpath/classpath/org/omg/IOP/IORHelper.java,v
retrieving revision 1.2
diff -u -r1.2 IORHelper.java
--- org/omg/IOP/IORHelper.java 2 Jul 2005 20:33:00 -0000 1.2
+++ org/omg/IOP/IORHelper.java 5 Oct 2005 10:14:46 -0000
@@ -38,6 +38,8 @@
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 @@
catch (ClassCastException cex)
{
BAD_OPERATION bad = new BAD_OPERATION("IOR expected");
+ bad.minor = Minor.Any;
bad.initCause(cex);
throw bad;
}
Index: org/omg/IOP/MultipleComponentProfileHelper.java
===================================================================
RCS file:
/cvsroot/classpath/classpath/org/omg/IOP/MultipleComponentProfileHelper.java,v
retrieving revision 1.2
diff -u -r1.2 MultipleComponentProfileHelper.java
--- org/omg/IOP/MultipleComponentProfileHelper.java 2 Jul 2005 20:33:00
-0000 1.2
+++ org/omg/IOP/MultipleComponentProfileHelper.java 5 Oct 2005 10:14:46
-0000
@@ -38,6 +38,8 @@
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 @@
catch (ClassCastException cex)
{
BAD_OPERATION bad = new BAD_OPERATION("MultipleComponentProfile
expected");
+ bad.minor = Minor.Any;
bad.initCause(cex);
throw bad;
}
Index: org/omg/IOP/ServiceContextHelper.java
===================================================================
RCS file: /cvsroot/classpath/classpath/org/omg/IOP/ServiceContextHelper.java,v
retrieving revision 1.2
diff -u -r1.2 ServiceContextHelper.java
--- org/omg/IOP/ServiceContextHelper.java 2 Jul 2005 20:33:00 -0000
1.2
+++ org/omg/IOP/ServiceContextHelper.java 5 Oct 2005 10:14:46 -0000
@@ -38,6 +38,8 @@
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 @@
catch (ClassCastException cex)
{
BAD_OPERATION bad = new BAD_OPERATION("ServiceContext expected");
+ bad.minor = Minor.Any;
bad.initCause(cex);
throw bad;
}
Index: org/omg/IOP/ServiceContextListHelper.java
===================================================================
RCS file:
/cvsroot/classpath/classpath/org/omg/IOP/ServiceContextListHelper.java,v
retrieving revision 1.2
diff -u -r1.2 ServiceContextListHelper.java
--- org/omg/IOP/ServiceContextListHelper.java 2 Jul 2005 20:33:00 -0000
1.2
+++ org/omg/IOP/ServiceContextListHelper.java 5 Oct 2005 10:06:16 -0000
@@ -38,6 +38,8 @@
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 @@
}
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;
}
}
Index: org/omg/IOP/TaggedComponentHelper.java
===================================================================
RCS file: /cvsroot/classpath/classpath/org/omg/IOP/TaggedComponentHelper.java,v
retrieving revision 1.4
diff -u -r1.4 TaggedComponentHelper.java
--- org/omg/IOP/TaggedComponentHelper.java 4 Oct 2005 17:58:16 -0000
1.4
+++ org/omg/IOP/TaggedComponentHelper.java 5 Oct 2005 10:14:46 -0000
@@ -117,6 +117,7 @@
catch (ClassCastException cex)
{
BAD_OPERATION bad = new BAD_OPERATION("TaggedComponent expected");
+ bad.minor = Minor.Any;
bad.initCause(cex);
throw bad;
}
Index: org/omg/IOP/TaggedProfileHelper.java
===================================================================
RCS file: /cvsroot/classpath/classpath/org/omg/IOP/TaggedProfileHelper.java,v
retrieving revision 1.4
diff -u -r1.4 TaggedProfileHelper.java
--- org/omg/IOP/TaggedProfileHelper.java 4 Oct 2005 17:58:16 -0000
1.4
+++ org/omg/IOP/TaggedProfileHelper.java 5 Oct 2005 10:14:46 -0000
@@ -119,6 +119,7 @@
catch (ClassCastException cex)
{
BAD_OPERATION bad = new BAD_OPERATION("TaggedProfile expected");
+ bad.minor = Minor.Any;
bad.initCause(cex);
throw bad;
}
Index: org/omg/IOP/CodecFactoryPackage/UnknownEncodingHelper.java
===================================================================
RCS file:
/cvsroot/classpath/classpath/org/omg/IOP/CodecFactoryPackage/UnknownEncodingHelper.java,v
retrieving revision 1.2
diff -u -r1.2 UnknownEncodingHelper.java
--- org/omg/IOP/CodecFactoryPackage/UnknownEncodingHelper.java 2 Jul 2005
20:33:01 -0000 1.2
+++ org/omg/IOP/CodecFactoryPackage/UnknownEncodingHelper.java 5 Oct 2005
10:14:46 -0000
@@ -39,6 +39,7 @@
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 @@
{
BAD_OPERATION bad = new BAD_OPERATION("UnknownEncoding expected");
bad.initCause(cex);
+ bad.minor = Minor.Any;
throw bad;
}
}
Index: org/omg/IOP/CodecPackage/FormatMismatchHelper.java
===================================================================
RCS file:
/cvsroot/classpath/classpath/org/omg/IOP/CodecPackage/FormatMismatchHelper.java,v
retrieving revision 1.2
diff -u -r1.2 FormatMismatchHelper.java
--- org/omg/IOP/CodecPackage/FormatMismatchHelper.java 2 Jul 2005 20:33:01
-0000 1.2
+++ org/omg/IOP/CodecPackage/FormatMismatchHelper.java 5 Oct 2005 10:14:46
-0000
@@ -39,6 +39,7 @@
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 @@
catch (ClassCastException cex)
{
BAD_OPERATION bad = new BAD_OPERATION("FormatMismatch expected");
+ bad.minor = Minor.Any;
bad.initCause(cex);
throw bad;
}
Index: org/omg/IOP/CodecPackage/InvalidTypeForEncodingHelper.java
===================================================================
RCS file:
/cvsroot/classpath/classpath/org/omg/IOP/CodecPackage/InvalidTypeForEncodingHelper.java,v
retrieving revision 1.2
diff -u -r1.2 InvalidTypeForEncodingHelper.java
--- org/omg/IOP/CodecPackage/InvalidTypeForEncodingHelper.java 2 Jul 2005
20:33:01 -0000 1.2
+++ org/omg/IOP/CodecPackage/InvalidTypeForEncodingHelper.java 5 Oct 2005
10:14:46 -0000
@@ -39,6 +39,7 @@
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 @@
{
BAD_OPERATION bad =
new BAD_OPERATION("InvalidTypeForEncoding expected");
+ bad.minor = Minor.Any;
bad.initCause(cex);
throw bad;
}
Index: org/omg/IOP/CodecPackage/TypeMismatchHelper.java
===================================================================
RCS file:
/cvsroot/classpath/classpath/org/omg/IOP/CodecPackage/TypeMismatchHelper.java,v
retrieving revision 1.2
diff -u -r1.2 TypeMismatchHelper.java
--- org/omg/IOP/CodecPackage/TypeMismatchHelper.java 2 Jul 2005 20:33:01
-0000 1.2
+++ org/omg/IOP/CodecPackage/TypeMismatchHelper.java 5 Oct 2005 10:14:46
-0000
@@ -39,6 +39,7 @@
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 @@
catch (ClassCastException cex)
{
BAD_OPERATION bad = new BAD_OPERATION("TypeMismatch expected");
+ bad.minor = Minor.Any;
bad.initCause(cex);
throw bad;
}
Index: org/omg/PortableInterceptor/ForwardRequestHelper.java
===================================================================
RCS file:
/cvsroot/classpath/classpath/org/omg/PortableInterceptor/ForwardRequestHelper.java,v
retrieving revision 1.1
diff -u -r1.1 ForwardRequestHelper.java
--- org/omg/PortableInterceptor/ForwardRequestHelper.java 28 Aug 2005
11:23:37 -0000 1.1
+++ org/omg/PortableInterceptor/ForwardRequestHelper.java 5 Oct 2005
10:14:46 -0000
@@ -38,6 +38,7 @@
package org.omg.PortableInterceptor;
+import gnu.CORBA.Minor;
import gnu.CORBA.Interceptor.ForwardRequestHolder;
import org.omg.CORBA.Any;
@@ -106,6 +107,7 @@
catch (ClassCastException cex)
{
BAD_OPERATION bad = new BAD_OPERATION(id() + " expected");
+ bad.minor = Minor.Any;
bad.initCause(cex);
throw bad;
}
Index: org/omg/PortableInterceptor/InvalidSlotHelper.java
===================================================================
RCS file:
/cvsroot/classpath/classpath/org/omg/PortableInterceptor/InvalidSlotHelper.java,v
retrieving revision 1.1
diff -u -r1.1 InvalidSlotHelper.java
--- org/omg/PortableInterceptor/InvalidSlotHelper.java 28 Aug 2005 11:23:37
-0000 1.1
+++ org/omg/PortableInterceptor/InvalidSlotHelper.java 5 Oct 2005 10:14:46
-0000
@@ -39,6 +39,7 @@
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 @@
catch (ClassCastException cex)
{
BAD_OPERATION bad = new BAD_OPERATION("InvalidSlot expected");
+ bad.minor = Minor.Any;
bad.initCause(cex);
throw bad;
}
Index: org/omg/PortableInterceptor/ORBInitInfoPackage/DuplicateNameHelper.java
===================================================================
RCS file:
/cvsroot/classpath/classpath/org/omg/PortableInterceptor/ORBInitInfoPackage/DuplicateNameHelper.java,v
retrieving revision 1.3
diff -u -r1.3 DuplicateNameHelper.java
--- org/omg/PortableInterceptor/ORBInitInfoPackage/DuplicateNameHelper.java
28 Aug 2005 11:23:37 -0000 1.3
+++ org/omg/PortableInterceptor/ORBInitInfoPackage/DuplicateNameHelper.java
5 Oct 2005 10:14:46 -0000
@@ -110,6 +110,7 @@
catch (ClassCastException cex)
{
BAD_OPERATION bad = new BAD_OPERATION("DuplicateName expected");
+ bad.minor = Minor.Any;
bad.initCause(cex);
throw bad;
}
Index: org/omg/PortableInterceptor/ORBInitInfoPackage/InvalidNameHelper.java
===================================================================
RCS file:
/cvsroot/classpath/classpath/org/omg/PortableInterceptor/ORBInitInfoPackage/InvalidNameHelper.java,v
retrieving revision 1.3
diff -u -r1.3 InvalidNameHelper.java
--- org/omg/PortableInterceptor/ORBInitInfoPackage/InvalidNameHelper.java
28 Aug 2005 11:23:37 -0000 1.3
+++ org/omg/PortableInterceptor/ORBInitInfoPackage/InvalidNameHelper.java
5 Oct 2005 10:14:46 -0000
@@ -39,6 +39,7 @@
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 @@
catch (ClassCastException cex)
{
BAD_OPERATION bad = new BAD_OPERATION("InvalidName expected");
+ bad.minor = Minor.Any;
bad.initCause(cex);
throw bad;
}
Index: org/omg/PortableServer/ForwardRequestHelper.java
===================================================================
RCS file:
/cvsroot/classpath/classpath/org/omg/PortableServer/ForwardRequestHelper.java,v
retrieving revision 1.2
diff -u -r1.2 ForwardRequestHelper.java
--- org/omg/PortableServer/ForwardRequestHelper.java 24 Aug 2005 22:57:08
-0000 1.2
+++ org/omg/PortableServer/ForwardRequestHelper.java 5 Oct 2005 10:14:52
-0000
@@ -38,6 +38,7 @@
package org.omg.PortableServer;
+import gnu.CORBA.Minor;
import gnu.CORBA.Poa.ForwardRequestHolder;
import org.omg.CORBA.Any;
@@ -80,6 +81,7 @@
catch (ClassCastException cex)
{
BAD_OPERATION bad = new BAD_OPERATION("ForwardRequest expected");
+ bad.minor = Minor.Any;
bad.initCause(cex);
throw bad;
}
Index: org/omg/PortableServer/IdAssignmentPolicyValue.java
===================================================================
RCS file:
/cvsroot/classpath/classpath/org/omg/PortableServer/IdAssignmentPolicyValue.java,v
retrieving revision 1.3
diff -u -r1.3 IdAssignmentPolicyValue.java
--- org/omg/PortableServer/IdAssignmentPolicyValue.java 2 Jul 2005 21:34:16
-0000 1.3
+++ org/omg/PortableServer/IdAssignmentPolicyValue.java 5 Oct 2005 10:14:52
-0000
@@ -38,6 +38,8 @@
package org.omg.PortableServer;
+import gnu.CORBA.Minor;
+
import org.omg.CORBA.BAD_OPERATION;
import org.omg.CORBA.portable.IDLEntity;
@@ -129,7 +131,9 @@
}
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;
}
}
Index: org/omg/PortableServer/IdUniquenessPolicyValue.java
===================================================================
RCS file:
/cvsroot/classpath/classpath/org/omg/PortableServer/IdUniquenessPolicyValue.java,v
retrieving revision 1.3
diff -u -r1.3 IdUniquenessPolicyValue.java
--- org/omg/PortableServer/IdUniquenessPolicyValue.java 2 Jul 2005 21:34:16
-0000 1.3
+++ org/omg/PortableServer/IdUniquenessPolicyValue.java 5 Oct 2005 10:14:52
-0000
@@ -38,6 +38,8 @@
package org.omg.PortableServer;
+import gnu.CORBA.Minor;
+
import org.omg.CORBA.BAD_OPERATION;
import org.omg.CORBA.portable.IDLEntity;
@@ -129,7 +131,9 @@
}
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;
}
}
Index: org/omg/PortableServer/ImplicitActivationPolicyValue.java
===================================================================
RCS file:
/cvsroot/classpath/classpath/org/omg/PortableServer/ImplicitActivationPolicyValue.java,v
retrieving revision 1.3
diff -u -r1.3 ImplicitActivationPolicyValue.java
--- org/omg/PortableServer/ImplicitActivationPolicyValue.java 2 Jul 2005
21:34:16 -0000 1.3
+++ org/omg/PortableServer/ImplicitActivationPolicyValue.java 5 Oct 2005
10:14:52 -0000
@@ -38,6 +38,8 @@
package org.omg.PortableServer;
+import gnu.CORBA.Minor;
+
import org.omg.CORBA.BAD_OPERATION;
import org.omg.CORBA.portable.IDLEntity;
@@ -129,7 +131,9 @@
}
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;
}
}
Index: org/omg/PortableServer/LifespanPolicyValue.java
===================================================================
RCS file:
/cvsroot/classpath/classpath/org/omg/PortableServer/LifespanPolicyValue.java,v
retrieving revision 1.3
diff -u -r1.3 LifespanPolicyValue.java
--- org/omg/PortableServer/LifespanPolicyValue.java 2 Jul 2005 21:34:16
-0000 1.3
+++ org/omg/PortableServer/LifespanPolicyValue.java 5 Oct 2005 10:14:52
-0000
@@ -38,6 +38,8 @@
package org.omg.PortableServer;
+import gnu.CORBA.Minor;
+
import org.omg.CORBA.BAD_OPERATION;
import org.omg.CORBA.portable.IDLEntity;
@@ -126,7 +128,9 @@
}
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;
}
}
Index: org/omg/PortableServer/RequestProcessingPolicyValue.java
===================================================================
RCS file:
/cvsroot/classpath/classpath/org/omg/PortableServer/RequestProcessingPolicyValue.java,v
retrieving revision 1.3
diff -u -r1.3 RequestProcessingPolicyValue.java
--- org/omg/PortableServer/RequestProcessingPolicyValue.java 2 Jul 2005
21:34:16 -0000 1.3
+++ org/omg/PortableServer/RequestProcessingPolicyValue.java 5 Oct 2005
10:14:52 -0000
@@ -38,6 +38,8 @@
package org.omg.PortableServer;
+import gnu.CORBA.Minor;
+
import org.omg.CORBA.BAD_OPERATION;
import org.omg.CORBA.portable.IDLEntity;
@@ -151,7 +153,9 @@
}
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;
}
}
Index: org/omg/PortableServer/Servant.java
===================================================================
RCS file: /cvsroot/classpath/classpath/org/omg/PortableServer/Servant.java,v
retrieving revision 1.1
diff -u -r1.1 Servant.java
--- org/omg/PortableServer/Servant.java 22 Jul 2005 16:57:47 -0000 1.1
+++ org/omg/PortableServer/Servant.java 5 Oct 2005 09:47:14 -0000
@@ -45,6 +45,8 @@
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 @@
catch (WrongPolicy unexp)
{
BAD_OPERATION bad = new BAD_OPERATION();
+ bad.minor = Minor.Policy;
bad.initCause(unexp);
throw bad;
}
@@ -253,6 +256,7 @@
unexp.initCause(ex);
BAD_OPERATION bad = new BAD_OPERATION();
+ bad.minor = Minor.Activation;
bad.initCause(unexp);
throw bad;
}
Index: org/omg/PortableServer/ServantLocatorHelper.java
===================================================================
RCS file:
/cvsroot/classpath/classpath/org/omg/PortableServer/ServantLocatorHelper.java,v
retrieving revision 1.3
diff -u -r1.3 ServantLocatorHelper.java
--- org/omg/PortableServer/ServantLocatorHelper.java 4 Oct 2005 17:58:16
-0000 1.3
+++ org/omg/PortableServer/ServantLocatorHelper.java 5 Oct 2005 09:47:46
-0000
@@ -110,6 +110,7 @@
catch (ClassCastException ex)
{
BAD_OPERATION bad = new BAD_OPERATION();
+ bad.minor = Minor.ClassCast;
bad.initCause(ex);
throw bad;
}
Index: org/omg/PortableServer/ServantRetentionPolicyValue.java
===================================================================
RCS file:
/cvsroot/classpath/classpath/org/omg/PortableServer/ServantRetentionPolicyValue.java,v
retrieving revision 1.3
diff -u -r1.3 ServantRetentionPolicyValue.java
--- org/omg/PortableServer/ServantRetentionPolicyValue.java 2 Jul 2005
21:34:16 -0000 1.3
+++ org/omg/PortableServer/ServantRetentionPolicyValue.java 5 Oct 2005
10:14:52 -0000
@@ -38,6 +38,8 @@
package org.omg.PortableServer;
+import gnu.CORBA.Minor;
+
import org.omg.CORBA.BAD_OPERATION;
import org.omg.CORBA.portable.IDLEntity;
@@ -126,7 +128,9 @@
}
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;
}
}
Index: org/omg/PortableServer/ThreadPolicyValue.java
===================================================================
RCS file:
/cvsroot/classpath/classpath/org/omg/PortableServer/ThreadPolicyValue.java,v
retrieving revision 1.1
diff -u -r1.1 ThreadPolicyValue.java
--- org/omg/PortableServer/ThreadPolicyValue.java 17 Jul 2005 20:05:27
-0000 1.1
+++ org/omg/PortableServer/ThreadPolicyValue.java 5 Oct 2005 10:14:22
-0000
@@ -38,6 +38,8 @@
package org.omg.PortableServer;
+import gnu.CORBA.Minor;
+
import org.omg.CORBA.BAD_OPERATION;
import org.omg.CORBA.portable.IDLEntity;
@@ -139,7 +141,9 @@
}
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;
}
}
Index: org/omg/PortableServer/CurrentPackage/NoContextHelper.java
===================================================================
RCS file:
/cvsroot/classpath/classpath/org/omg/PortableServer/CurrentPackage/NoContextHelper.java,v
retrieving revision 1.2
diff -u -r1.2 NoContextHelper.java
--- org/omg/PortableServer/CurrentPackage/NoContextHelper.java 2 Jul 2005
20:33:01 -0000 1.2
+++ org/omg/PortableServer/CurrentPackage/NoContextHelper.java 5 Oct 2005
10:14:46 -0000
@@ -39,6 +39,7 @@
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 @@
catch (ClassCastException cex)
{
BAD_OPERATION bad = new BAD_OPERATION("NoContext expected");
+ bad.minor = Minor.Any;
bad.initCause(cex);
throw bad;
}
Index: org/omg/PortableServer/POAManagerPackage/AdapterInactiveHelper.java
===================================================================
RCS file:
/cvsroot/classpath/classpath/org/omg/PortableServer/POAManagerPackage/AdapterInactiveHelper.java,v
retrieving revision 1.2
diff -u -r1.2 AdapterInactiveHelper.java
--- org/omg/PortableServer/POAManagerPackage/AdapterInactiveHelper.java 2 Jul
2005 20:33:01 -0000 1.2
+++ org/omg/PortableServer/POAManagerPackage/AdapterInactiveHelper.java 5 Oct
2005 10:14:46 -0000
@@ -39,6 +39,7 @@
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 @@
catch (ClassCastException cex)
{
BAD_OPERATION bad = new BAD_OPERATION("AdapterInactive expected");
+ bad.minor = Minor.Any;
bad.initCause(cex);
throw bad;
}
Index: org/omg/PortableServer/POAManagerPackage/State.java
===================================================================
RCS file:
/cvsroot/classpath/classpath/org/omg/PortableServer/POAManagerPackage/State.java,v
retrieving revision 1.2
diff -u -r1.2 State.java
--- org/omg/PortableServer/POAManagerPackage/State.java 2 Jul 2005 20:33:01
-0000 1.2
+++ org/omg/PortableServer/POAManagerPackage/State.java 5 Oct 2005 10:08:24
-0000
@@ -38,6 +38,8 @@
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 @@
/**
* 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 @@
{
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()
Index: org/omg/PortableServer/POAPackage/AdapterAlreadyExistsHelper.java
===================================================================
RCS file:
/cvsroot/classpath/classpath/org/omg/PortableServer/POAPackage/AdapterAlreadyExistsHelper.java,v
retrieving revision 1.2
diff -u -r1.2 AdapterAlreadyExistsHelper.java
--- org/omg/PortableServer/POAPackage/AdapterAlreadyExistsHelper.java 2 Jul
2005 20:33:01 -0000 1.2
+++ org/omg/PortableServer/POAPackage/AdapterAlreadyExistsHelper.java 5 Oct
2005 10:14:46 -0000
@@ -39,6 +39,7 @@
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 @@
catch (ClassCastException cex)
{
BAD_OPERATION bad = new BAD_OPERATION("AdapterAlreadyExists expected");
+ bad.minor = Minor.Any;
bad.initCause(cex);
throw bad;
}
Index: org/omg/PortableServer/POAPackage/AdapterNonExistentHelper.java
===================================================================
RCS file:
/cvsroot/classpath/classpath/org/omg/PortableServer/POAPackage/AdapterNonExistentHelper.java,v
retrieving revision 1.2
diff -u -r1.2 AdapterNonExistentHelper.java
--- org/omg/PortableServer/POAPackage/AdapterNonExistentHelper.java 2 Jul
2005 20:33:01 -0000 1.2
+++ org/omg/PortableServer/POAPackage/AdapterNonExistentHelper.java 5 Oct
2005 10:14:46 -0000
@@ -39,6 +39,7 @@
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 @@
catch (ClassCastException cex)
{
BAD_OPERATION bad = new BAD_OPERATION("AdapterNonExistent expected");
+ bad.minor = Minor.Any;
bad.initCause(cex);
throw bad;
}
Index: org/omg/PortableServer/POAPackage/InvalidPolicyHelper.java
===================================================================
RCS file:
/cvsroot/classpath/classpath/org/omg/PortableServer/POAPackage/InvalidPolicyHelper.java,v
retrieving revision 1.2
diff -u -r1.2 InvalidPolicyHelper.java
--- org/omg/PortableServer/POAPackage/InvalidPolicyHelper.java 2 Jul 2005
20:33:01 -0000 1.2
+++ org/omg/PortableServer/POAPackage/InvalidPolicyHelper.java 5 Oct 2005
10:14:48 -0000
@@ -38,6 +38,7 @@
package org.omg.PortableServer.POAPackage;
+import gnu.CORBA.Minor;
import gnu.CORBA.Poa.InvalidPolicyHolder;
import org.omg.CORBA.Any;
@@ -110,6 +111,7 @@
catch (ClassCastException cex)
{
BAD_OPERATION bad = new BAD_OPERATION("InvalidPolicy expected");
+ bad.minor = Minor.Any;
bad.initCause(cex);
throw bad;
}
Index: org/omg/PortableServer/POAPackage/NoServantHelper.java
===================================================================
RCS file:
/cvsroot/classpath/classpath/org/omg/PortableServer/POAPackage/NoServantHelper.java,v
retrieving revision 1.2
diff -u -r1.2 NoServantHelper.java
--- org/omg/PortableServer/POAPackage/NoServantHelper.java 2 Jul 2005
20:33:01 -0000 1.2
+++ org/omg/PortableServer/POAPackage/NoServantHelper.java 5 Oct 2005
10:14:48 -0000
@@ -39,6 +39,7 @@
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 @@
catch (ClassCastException cex)
{
BAD_OPERATION bad = new BAD_OPERATION("NoServant expected");
+ bad.minor = Minor.Any;
bad.initCause(cex);
throw bad;
}
Index: org/omg/PortableServer/POAPackage/ObjectAlreadyActiveHelper.java
===================================================================
RCS file:
/cvsroot/classpath/classpath/org/omg/PortableServer/POAPackage/ObjectAlreadyActiveHelper.java,v
retrieving revision 1.2
diff -u -r1.2 ObjectAlreadyActiveHelper.java
--- org/omg/PortableServer/POAPackage/ObjectAlreadyActiveHelper.java 2 Jul
2005 20:33:01 -0000 1.2
+++ org/omg/PortableServer/POAPackage/ObjectAlreadyActiveHelper.java 5 Oct
2005 10:14:48 -0000
@@ -39,6 +39,7 @@
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 @@
catch (ClassCastException cex)
{
BAD_OPERATION bad = new BAD_OPERATION("ObjectAlreadyActive expected");
+ bad.minor = Minor.Any;
bad.initCause(cex);
throw bad;
}
Index: org/omg/PortableServer/POAPackage/ObjectNotActiveHelper.java
===================================================================
RCS file:
/cvsroot/classpath/classpath/org/omg/PortableServer/POAPackage/ObjectNotActiveHelper.java,v
retrieving revision 1.2
diff -u -r1.2 ObjectNotActiveHelper.java
--- org/omg/PortableServer/POAPackage/ObjectNotActiveHelper.java 2 Jul
2005 20:33:01 -0000 1.2
+++ org/omg/PortableServer/POAPackage/ObjectNotActiveHelper.java 5 Oct
2005 10:14:48 -0000
@@ -39,6 +39,7 @@
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 @@
catch (ClassCastException cex)
{
BAD_OPERATION bad = new BAD_OPERATION("ObjectNotActive expected");
+ bad.minor = Minor.Any;
bad.initCause(cex);
throw bad;
}
Index: org/omg/PortableServer/POAPackage/ServantAlreadyActiveHelper.java
===================================================================
RCS file:
/cvsroot/classpath/classpath/org/omg/PortableServer/POAPackage/ServantAlreadyActiveHelper.java,v
retrieving revision 1.2
diff -u -r1.2 ServantAlreadyActiveHelper.java
--- org/omg/PortableServer/POAPackage/ServantAlreadyActiveHelper.java 2 Jul
2005 20:33:01 -0000 1.2
+++ org/omg/PortableServer/POAPackage/ServantAlreadyActiveHelper.java 5 Oct
2005 10:14:48 -0000
@@ -39,6 +39,7 @@
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 @@
catch (ClassCastException cex)
{
BAD_OPERATION bad = new BAD_OPERATION("ServantAlreadyActive expected");
+ bad.minor = Minor.Any;
bad.initCause(cex);
throw bad;
}
Index: org/omg/PortableServer/POAPackage/ServantNotActiveHelper.java
===================================================================
RCS file:
/cvsroot/classpath/classpath/org/omg/PortableServer/POAPackage/ServantNotActiveHelper.java,v
retrieving revision 1.2
diff -u -r1.2 ServantNotActiveHelper.java
--- org/omg/PortableServer/POAPackage/ServantNotActiveHelper.java 2 Jul
2005 20:33:01 -0000 1.2
+++ org/omg/PortableServer/POAPackage/ServantNotActiveHelper.java 5 Oct
2005 10:14:48 -0000
@@ -39,6 +39,7 @@
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 @@
catch (ClassCastException cex)
{
BAD_OPERATION bad = new BAD_OPERATION("ServantNotActive expected");
+ bad.minor = Minor.Any;
bad.initCause(cex);
throw bad;
}
Index: org/omg/PortableServer/POAPackage/WrongAdapterHelper.java
===================================================================
RCS file:
/cvsroot/classpath/classpath/org/omg/PortableServer/POAPackage/WrongAdapterHelper.java,v
retrieving revision 1.2
diff -u -r1.2 WrongAdapterHelper.java
--- org/omg/PortableServer/POAPackage/WrongAdapterHelper.java 2 Jul 2005
20:33:01 -0000 1.2
+++ org/omg/PortableServer/POAPackage/WrongAdapterHelper.java 5 Oct 2005
10:14:52 -0000
@@ -39,6 +39,7 @@
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 @@
catch (ClassCastException cex)
{
BAD_OPERATION bad = new BAD_OPERATION("WrongAdapter expected");
+ bad.minor = Minor.Any;
bad.initCause(cex);
throw bad;
}
Index: org/omg/PortableServer/POAPackage/WrongPolicyHelper.java
===================================================================
RCS file:
/cvsroot/classpath/classpath/org/omg/PortableServer/POAPackage/WrongPolicyHelper.java,v
retrieving revision 1.2
diff -u -r1.2 WrongPolicyHelper.java
--- org/omg/PortableServer/POAPackage/WrongPolicyHelper.java 2 Jul 2005
20:33:01 -0000 1.2
+++ org/omg/PortableServer/POAPackage/WrongPolicyHelper.java 5 Oct 2005
10:14:52 -0000
@@ -39,6 +39,7 @@
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 @@
catch (ClassCastException cex)
{
BAD_OPERATION bad = new BAD_OPERATION("WrongPolicy expected");
+ bad.minor = Minor.Any;
bad.initCause(cex);
throw bad;
}
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [cp-patches] FYI: Exception minor codes for BAD_OPERATION and NO_RESOURCES,
Meskauskas Audrius <=