2005-10-04 Audrius Meskauskas <AudriusA@Bioinformatics.org>

        * gnu/CORBA/Minor.java: New file.
        * gnu/CORBA/CDR/IDLTypeHelper.java,
        gnu/CORBA/CDR/UnknownExceptionCtxHandler.java,
        gnu/CORBA/CDR/Vio.java,
        gnu/CORBA/CDR/cdrInput.java,
        gnu/CORBA/CDR/cdrOutput.java,
        gnu/CORBA/CDR/gnuRuntime.java,
        gnu/CORBA/CDR/noHeaderInput.java,
        gnu/CORBA/DynAn/gnuDynValue.java,
        gnu/CORBA/GIOP/CloseMessage.java,
        gnu/CORBA/GIOP/ErrorMessage.java,
        gnu/CORBA/GIOP/MessageHeader.java,
        gnu/CORBA/GIOP/v1_2/RequestHeader.java,
        gnu/CORBA/IOR.java,
        gnu/CORBA/Poa/ForwardedServant.java,
        gnu/CORBA/Version.java,
        gnu/CORBA/cdrEncapsCodec.java,
        gnu/CORBA/gnuAny.java,
        gnu/CORBA/gnuRequest.java,
        gnu/CORBA/streamReadyHolder.java,
        gnu/CORBA/universalHolder.java,
        gnu/javax/rmi/CORBA/UtilDelegateImpl.java,
        gnu/javax/rmi/CORBA/corbaObjectOutput.java,
        gnu/javax/rmi/CORBA/gnuRmiUtil.java,
        org/omg/CORBA/StringValueHelper.java,
        org/omg/CORBA/StructMemberHelper.java,
        org/omg/CORBA/UnionMemberHelper.java,
        org/omg/CORBA/ValueMemberHelper.java,
        org/omg/CORBA/WStringValueHelper.java,
        org/omg/CORBA/_IDLTypeStub.java,
        org/omg/DynamicAny/DynAnyFactoryHelper.java,
        org/omg/DynamicAny/_DynAnyFactoryStub.java,
        org/omg/IOP/TaggedComponentHelper.java,
        org/omg/IOP/TaggedProfileHelper.java,
        org/omg/PortableInterceptor/CurrentHelper.java,
        org/omg/PortableServer/POAHelper.java,
        org/omg/PortableServer/ServantActivatorHelper.java,
        org/omg/PortableServer/ServantLocatorHelper.java:
        Initialising minor codes for MARSHAL.
        * org/omg/CORBA/SystemException.java: Documentation update and
        add minor code to the exception message.
        * org/omg/CORBA/MARSHAL.java: Documentation update.

16 files changed, 349 insertions, 76 deletions

diff --git a/org/omg/CORBA/MARSHAL.java b/org/omg/CORBA/MARSHAL.java
index 34cfa78f6..05660b173 100644
--- a/org/omg/CORBA/MARSHAL.java
+++ b/org/omg/CORBA/MARSHAL.java
@@ -1,39 +1,39 @@
 /* MARSHAL.java --
-   Copyright (C) 2005 Free Software Foundation, Inc.
+ Copyright (C) 2005 Free Software Foundation, Inc.
 
-This file is part of GNU Classpath.
+ This file is part of GNU Classpath.
 
-GNU Classpath is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
+ GNU Classpath is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2, or (at your option)
+ any later version.
 
-GNU Classpath is distributed in the hope that it will be useful, but
-WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-General Public License for more details.
+ GNU Classpath is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ General Public License for more details.
 
-You should have received a copy of the GNU General Public License
-along with GNU Classpath; see the file COPYING.  If not, write to the
-Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-02110-1301 USA.
+ You should have received a copy of the GNU General Public License
+ along with GNU Classpath; see the file COPYING.  If not, write to the
+ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ 02110-1301 USA.
 
-Linking this library statically or dynamically with other modules is
-making a combined work based on this library.  Thus, the terms and
-conditions of the GNU General Public License cover the whole
-combination.
+ Linking this library statically or dynamically with other modules is
+ making a combined work based on this library.  Thus, the terms and
+ conditions of the GNU General Public License cover the whole
+ combination.
 
-As a special exception, the copyright holders of this library give you
-permission to link this library with independent modules to produce an
-executable, regardless of the license terms of these independent
-modules, and to copy and distribute the resulting executable under
-terms of your choice, provided that you also meet, for each linked
-independent module, the terms and conditions of the license of that
-module.  An independent module is a module which is not derived from
-or based on this library.  If you modify this library, you may extend
-this exception to your version of the library, but you are not
-obligated to do so.  If you do not wish to do so, delete this
-exception statement from your version. */
+ As a special exception, the copyright holders of this library give you
+ permission to link this library with independent modules to produce an
+ executable, regardless of the license terms of these independent
+ modules, and to copy and distribute the resulting executable under
+ terms of your choice, provided that you also meet, for each linked
+ independent module, the terms and conditions of the license of that
+ module.  An independent module is a module which is not derived from
+ or based on this library.  If you modify this library, you may extend
+ this exception to your version of the library, but you are not
+ obligated to do so.  If you do not wish to do so, delete this
+ exception statement from your version. */
 
 
 package org.omg.CORBA;
@@ -41,8 +41,230 @@ package org.omg.CORBA;
 import java.io.Serializable;
 
 /**
- * Means that some request or reply from the network has a wrong
- * size or is structurally invalid.
+ * Means that some request or reply from the network has a wrong size or is
+ * structurally invalid. In GNU Classpath, this exception may have the following
+ * minor codes (the high 20 bits being Classpath VMCID):
+ * 
+ * <table border="1">
+ * <tr>
+ * <th>Hex</th>
+ * <th>Dec</th>
+ * <th>Minor</th>
+ * <th>Name</th>
+ * <th>Case</th>
+ * </tr>
+ * <tr>
+ * <td>47430001</td>
+ * <td>1195573249</td>
+ * <td>1</td>
+ * <td>Giop</td>
+ * <td>The message being received is not a GIOP message. It does not start from
+ * the expected magic sequence byte[] { 'G', 'I', 'O', 'P' }.</td>
+ * </tr>
+ * <tr>
+ * <td>47430002</td>
+ * <td>1195573250</td>
+ * <td>2</td>
+ * <td>Header</td>
+ * <td>The unexpected IOException while reading or writing the GIOP message
+ * header or the subsequent request or response header</td>
+ * </tr>
+ * <tr>
+ * <td>47430003</td>
+ * <td>1195573251</td>
+ * <td>3</td>
+ * <td>EOF</td>
+ * <td>The data stream ended before reading all expected values from it. This
+ * usually means that the CORBA message is corrupted, but may also indicate that
+ * the server expects the remote method being invoked to have more or different
+ * parameters</td>
+ * </tr>
+ * <tr>
+ * <td>47430005</td>
+ * <td>1195573253</td>
+ * <td>5</td>
+ * <td>CDR</td>
+ * <td>The unexpected IOException while reading or writing the data via Commond
+ * Data Representation stream</td>
+ * </tr>
+ * <tr>
+ * <td>47430006</td>
+ * <td>1195573254 </td>
+ * <td>6</td>
+ * <td>Value</td>
+ * <td>The unexpected IOException while reading or writing the Value type.
+ * </td>
+ * </tr>
+ * <tr>
+ * <td>47430007 </td>
+ * <td>1195573255</td>
+ * <td>7</td>
+ * <td>Forwarding</td>
+ * <td>The unexpected IOException while handling request forwarding.</td>
+ * </tr>
+ * <tr>
+ * <td>47430008</td>
+ * <td>1195573256</td>
+ * <td>8</td>
+ * <td>Encapsulation </td>
+ * <td>The unexpected IOException while handling data encapsulation, tagged
+ * components, tagged profiles, etc.</td>
+ * </tr>
+ * <tr>
+ * <td>47430009</td>
+ * <td>1195573257</td>
+ * <td>9 </td>
+ * <td>Any</td>
+ * <td>The unexpected IOException while inserting or extracting data to/from
+ * the Any.</td>
+ * </tr>
+ * <tr>
+ * <td>4743000a</td>
+ * <td>1195573258 </td>
+ * <td>10</td>
+ * <td>UserException</td>
+ * <td>The unexpected UserException in the context where it cannot be handled
+ * as such and must be converted to the SystemException. </td>
+ * </tr>
+ * <tr>
+ * <td>4743000b</td>
+ * <td>1195573259</td>
+ * <td>11</td>
+ * <td>Inappropriate</td>
+ * <td>While the operation could formally be applied to the target, the OMG
+ * standard states that it is actually not applicable. For example, some CORBA
+ * objects like POA are always local and should not be passed to or returned
+ * from the remote side.</td>
+ * </tr>
+ * <tr>
+ * <td>4743000c</td>
+ * <td>1195573260</td>
+ * <td>12</td>
+ * <td>Negative</td>
+ * <td>When reading data, it was discovered that size of the data structure
+ * like string, sequence or character is written as the negative number.</td>
+ * </tr>
+ * <tr>
+ * <td>4743000e</td>
+ * <td>1195573262 </td>
+ * <td>14</td>
+ * <td>Graph</td>
+ * <td>Reference to non-existing node in the data grapth while reading the
+ * value types.</td>
+ * </tr>
+ * <tr>
+ * <td>4743000f</td>
+ * <td>1195573263</td>
+ * <td>15</td>
+ * <td>Boxed</td>
+ * <td>Unexpected exception was thrown from the IDL type helper while handling
+ * the object of this type as a boxed value.</td>
+ * </tr>
+ * <tr>
+ * <td>47430010</td>
+ * <td>1195573264</td>
+ * <td>16</td>
+ * <td>Instantiation</td>
+ * <td>Unable to instantiate an value type object while reading it from the
+ * stream.</td>
+ * </tr>
+ * <tr>
+ * <td>47430011</td>
+ * <td>1195573265</td>
+ * <td>17</td>
+ * <td>ValueHeaderTag</td>
+ * <td>The header tag of the value type being read from the CDR stream contains
+ * an unexpected value outside 0x7fffff00 .. 0x7fffffff and also not null and
+ * not an indirection.</td>
+ * </tr>
+ * <tr>
+ * <td>47430012</td>
+ * <td>1195573266</td>
+ * <td>18</td>
+ * <td>ValueHeaderFlags</td>
+ * <td>The header tag flags of the value type being read from the CDR stream
+ * make the invalid combination (for instance, 0x7fffff04).</td>
+ * </tr>
+ * <tr>
+ * <td>47430013</td>
+ * <td>1195573267</td>
+ * <td>19</td>
+ * <td>ClassCast</td>
+ * <td>The value type class, written on the wire, is not compatible with the
+ * expected class, passed as a parameter to the InputStream.read_value.</td>
+ * </tr>
+ * <tr>
+ * <td>47430014</td>
+ * <td>1195573268</td>
+ * <td>20</td>
+ * <td>Offset</td>
+ * <td>Positive or otherwise invalid indirection offset when reading the data
+ * graph of the value type.</td>
+ * </tr>
+ * <tr>
+ * <td>47430015</td>
+ * <td>1195573269</td>
+ * <td>21</td>
+ * <td>Chunks</td>
+ * <td>Errors while reading the chunked value type.</td>
+ * </tr>
+ * <tr>
+ * <td>47430016</td>
+ * <td>1195573270</td>
+ * <td>22</td>
+ * <td>UnsupportedValue</td>
+ * <td>No means are provided to read or write this value type (not Streamable,
+ * not CustomMarshal, not Serializable, no factory, no helper.</td>
+ * </tr>
+ * <tr> 
+ * <td>47430017</td>
+ * <td>1195573271</td>
+ * <td>23</td>
+ * <td>Factory</td>
+ * <td>The value factory, required for the operation being invoked, is not
+ * registered with this ORB.</td>
+ * </tr>
+ * <tr>
+ * <td>47430018</td>
+ * <td>1195573272</td>
+ * <td>24</td>
+ * 
+ * <td>UnsupportedAddressing</td>
+ * <td>Unsupported object addressing method in GIOP request header.</td>
+ * </tr>
+ * <tr>
+ * <td>47430019</td>
+ * <td>1195573273</td>
+ * <td>25</td>
+ * <td>IOR</td>
+ * <td>Invalid object reference (IOR).</td>
+ * </tr>
+ * <tr>
+ * <td>4743001a</td>
+ * <td>1195573274</td>
+ * <td>26</td>
+ * <td>TargetConversion</td>
+ * <td>Problems with converting between stubs, ties, interfaces and
+ * implementations.</td>
+ * 
+ * </tr>
+ * <tr>
+ * <td>4743001b</td>
+ * <td>1195573275</td>
+ * <td>27</td>
+ * <td>ValueFields</td>
+ * <td>Problems with reading or writing the fields of the value type object
+ * </td>
+ * </tr>
+ * <tr>
+ * <td>4743001c</td>
+ * <td>1195573276</td>
+ * <td>28</td>
+ * <td>NonSerializable</td>
+ * <td>The instance of the value type, passed using RMI over IIOP, is not
+ * serializable</td>
+ * </tr>
+ * </table>
  * 
  * @author Audrius Meskauskas (AudriusA@Bioinformatics.org)
  */
@@ -50,14 +272,15 @@ public class MARSHAL
   extends SystemException
   implements Serializable
 {
-  /** 
+  /**
    * Use serialVersionUID for interoperability.
    */
   private static final long serialVersionUID = 7416408250336395546L;
 
   /**
-   * Creates a MARSHAL with the default minor code of 0,
-   * completion state COMPLETED_NO and the given explaining message.
+   * Creates a MARSHAL with the default minor code of 0, completion state
+   * COMPLETED_NO and the given explaining message.
+   * 
    * @param reasom the explaining message.
    */
   public MARSHAL(String message)
@@ -66,32 +289,35 @@ public class MARSHAL
   }
 
   /**
-   * Creates MARSHAL with the default minor code of 0 and a
-   * completion state COMPLETED_NO.
+   * Creates MARSHAL with the default minor code of 0 and a completion state
+   * COMPLETED_NO.
    */
   public MARSHAL()
   {
     super("", 0, CompletionStatus.COMPLETED_NO);
   }
 
-  /** Creates a MARSHAL exception with the specified minor
-   * code and completion status.
-   * @param minor additional error code.
-   * @param completed the method completion status.
+  /**
+   * Creates a MARSHAL exception with the specified minor code and completion
+   * status.
+   * 
+   * @param minor_code additional error code.
+   * @param is_completed the method completion status.
    */
-  public MARSHAL(int minor, CompletionStatus completed)
+  public MARSHAL(int minor_code, CompletionStatus is_completed)
   {
-    super("", minor, completed);
+    super("", minor_code, is_completed);
   }
 
   /**
    * Created MARSHAL exception, providing full information.
+   * 
    * @param reason explaining message.
-   * @param minor additional error code (the "minor").
-   * @param completed the method completion status.
+   * @param minor_code additional error code (the "minor").
+   * @param is_completed the method completion status.
    */
-  public MARSHAL(String reason, int minor, CompletionStatus completed)
+  public MARSHAL(String reason, int minor_code, CompletionStatus is_completed)
   {
-    super(reason, minor, completed);
+    super(reason, minor_code, is_completed);
   }
 }
diff --git a/org/omg/CORBA/StringValueHelper.java b/org/omg/CORBA/StringValueHelper.java
index c75accdd0..7ca088619 100644
--- a/org/omg/CORBA/StringValueHelper.java
+++ b/org/omg/CORBA/StringValueHelper.java
@@ -38,6 +38,7 @@ exception statement from your version. */
 
 package org.omg.CORBA;
 
+import gnu.CORBA.Minor;
 import gnu.CORBA.Restricted_ORB;
 
 import org.omg.CORBA.portable.BoxedValueHelper;
@@ -119,7 +120,9 @@ public class StringValueHelper
       }
     catch (ClassCastException ex)
       {
-        throw new MARSHAL("String expected");
+        MARSHAL m = new MARSHAL("String expected");
+        m.minor = Minor.ClassCast;
+        throw m;
       }
   }
 
diff --git a/org/omg/CORBA/StructMemberHelper.java b/org/omg/CORBA/StructMemberHelper.java
index 72d66fa91..37e185772 100644
--- a/org/omg/CORBA/StructMemberHelper.java
+++ b/org/omg/CORBA/StructMemberHelper.java
@@ -38,6 +38,7 @@ exception statement from your version. */
 
 package org.omg.CORBA;
 
+import gnu.CORBA.Minor;
 import gnu.CORBA.Restricted_ORB;
 import gnu.CORBA.TypeCodeHelper;
 
@@ -151,6 +152,7 @@ public abstract class StructMemberHelper
     catch (UserException ex)
       {
         MARSHAL m = new MARSHAL();
+        m.minor = Minor.UserException;
         m.initCause(ex);
         throw m;
       }
@@ -170,6 +172,7 @@ public abstract class StructMemberHelper
     catch (UserException ex)
       {
         MARSHAL m = new MARSHAL();
+        m.minor = Minor.UserException;
         m.initCause(ex);
         throw m;
       }
diff --git a/org/omg/CORBA/SystemException.java b/org/omg/CORBA/SystemException.java
index d7af7b0be..dd1936279 100644
--- a/org/omg/CORBA/SystemException.java
+++ b/org/omg/CORBA/SystemException.java
@@ -63,20 +63,16 @@ public class SystemException
    * <p>
    * Contains more details about the exception. The lower 12 bits contain a
    * code, defining the reason why exception has been thrown. The higher 20 bits
-   * hold "Vendor Minor Codeset ID" (VMCID), for instance 0x4F4D0000 (OMG
-   * standard), 0x54410000 (TAO), 0x4A430000 (JacORB), 0x49540000 (IONA) or
-   * 0x53550000 (Sun).
+   * hold "Vendor Minor Codeset ID" (VMCID).
    * </p>
-   * 
    * <p>
-   * The standard minor codes for the standard system exceptions are prefaced by
-   * the VMCID assigned to OMG, defined as 0x4F4D0000 (the code of
-   * the minor field for the standard exception with minor code 1 is
-   * 0x4F4D0001). Within a vendor assigned space, the assignment of values to
-   * minor codes is left to the vendor.
+   * The Classpath specifice minor exception codes are documented in the headers
+   * of the corresponding exceptions (for instance, {@link MARSHAL}).
    * </p>
    * 
    * The VMCID 0 and 0xfffff are reserved for experimental use. 
+   * 
+   * @see OMGVMCID
    */
   public int minor;
 
@@ -91,7 +87,8 @@ public class SystemException
   protected SystemException(String a_reason, int a_minor,
                             CompletionStatus a_completed)
   {
-    super(a_reason);
+    super(a_reason + " Minor: " + Integer.toHexString(a_minor) + " ("
+      + (a_minor & 0xFFF) + "). Completed: "+a_completed);
     minor = a_minor;
     completed = a_completed;
   }
diff --git a/org/omg/CORBA/UnionMemberHelper.java b/org/omg/CORBA/UnionMemberHelper.java
index a49435644..15bfb248d 100644
--- a/org/omg/CORBA/UnionMemberHelper.java
+++ b/org/omg/CORBA/UnionMemberHelper.java
@@ -38,6 +38,7 @@ exception statement from your version. */
 
 package org.omg.CORBA;
 
+import gnu.CORBA.Minor;
 import gnu.CORBA.Restricted_ORB;
 import gnu.CORBA.TypeCodeHelper;
 
@@ -152,6 +153,7 @@ public abstract class UnionMemberHelper
     catch (UserException ex)
       {
         MARSHAL m = new MARSHAL();
+        m.minor = Minor.UserException;
         m.initCause(ex);
         throw m;
       }
@@ -172,6 +174,7 @@ public abstract class UnionMemberHelper
     catch (UserException ex)
       {
         MARSHAL m = new MARSHAL();
+        m.minor = Minor.UserException;        
         m.initCause(ex);
         throw m;
       }
diff --git a/org/omg/CORBA/ValueMemberHelper.java b/org/omg/CORBA/ValueMemberHelper.java
index 208623c2e..ea148f7d2 100644
--- a/org/omg/CORBA/ValueMemberHelper.java
+++ b/org/omg/CORBA/ValueMemberHelper.java
@@ -38,6 +38,7 @@ exception statement from your version. */
 
 package org.omg.CORBA;
 
+import gnu.CORBA.Minor;
 import gnu.CORBA.Restricted_ORB;
 import gnu.CORBA.TypeCodeHelper;
 
@@ -177,6 +178,7 @@ public abstract class ValueMemberHelper
     catch (UserException ex)
       {
         MARSHAL m = new MARSHAL();
+        m.minor = Minor.UserException;        
         m.initCause(ex);
         throw m;
       }
@@ -200,6 +202,7 @@ public abstract class ValueMemberHelper
     catch (UserException ex)
       {
         MARSHAL m = new MARSHAL();
+        m.minor = Minor.UserException;        
         m.initCause(ex);
         throw m;
       }
diff --git a/org/omg/CORBA/WStringValueHelper.java b/org/omg/CORBA/WStringValueHelper.java
index 54944b304..994260211 100644
--- a/org/omg/CORBA/WStringValueHelper.java
+++ b/org/omg/CORBA/WStringValueHelper.java
@@ -38,6 +38,7 @@ exception statement from your version. */
 
 package org.omg.CORBA;
 
+import gnu.CORBA.Minor;
 import gnu.CORBA.Restricted_ORB;
 
 import org.omg.CORBA.portable.BoxedValueHelper;
@@ -119,7 +120,9 @@ public class WStringValueHelper
       }
     catch (ClassCastException ex)
       {
-        throw new MARSHAL("String expected");
+        MARSHAL m = new MARSHAL("String expected");
+        m.minor = Minor.ClassCast;
+        throw m;
       }
   }
 
diff --git a/org/omg/CORBA/_IDLTypeStub.java b/org/omg/CORBA/_IDLTypeStub.java
index db36fa780..7790e2e7e 100644
--- a/org/omg/CORBA/_IDLTypeStub.java
+++ b/org/omg/CORBA/_IDLTypeStub.java
@@ -38,6 +38,7 @@ exception statement from your version. */
 
 package org.omg.CORBA;
 
+import gnu.CORBA.Minor;
 import gnu.CORBA.TypeCodeHelper;
 
 import org.omg.CORBA.portable.ApplicationException;
@@ -114,6 +115,7 @@ public class _IDLTypeStub
     catch (UserException ex)
       {
         MARSHAL m = new MARSHAL();
+        m.minor = Minor.UserException;
         m.initCause(ex);
         throw m;
       }
diff --git a/org/omg/DynamicAny/DynAnyFactoryHelper.java b/org/omg/DynamicAny/DynAnyFactoryHelper.java
index 0c02916e5..e4942f41b 100644
--- a/org/omg/DynamicAny/DynAnyFactoryHelper.java
+++ b/org/omg/DynamicAny/DynAnyFactoryHelper.java
@@ -39,6 +39,8 @@ exception statement from your version. */
 
 package org.omg.DynamicAny;
 
+import gnu.CORBA.Minor;
+
 import org.omg.CORBA.BAD_PARAM;
 import org.omg.CORBA.TypeCode;
 import org.omg.CORBA.ORB;
@@ -161,13 +163,8 @@ public abstract class DynAnyFactoryHelper
    */
   static String not_applicable(String Id)
   {
-    try
-      {
-        throw new MARSHAL("The read/write are not applicable for " + Id);
-      }
-    catch (Exception e)
-      {
-        throw new MARSHAL();
-      }
+    MARSHAL m = new MARSHAL("The read/write are not applicable for " + Id);
+    m.minor = Minor.Inappropriate;
+    throw m;
   }
 }
\ No newline at end of file
diff --git a/org/omg/DynamicAny/_DynAnyFactoryStub.java b/org/omg/DynamicAny/_DynAnyFactoryStub.java
index b0f6d6052..15f7c816b 100644
--- a/org/omg/DynamicAny/_DynAnyFactoryStub.java
+++ b/org/omg/DynamicAny/_DynAnyFactoryStub.java
@@ -38,6 +38,8 @@ exception statement from your version. */
 
 package org.omg.DynamicAny;
 
+import gnu.CORBA.Minor;
+
 import org.omg.CORBA.Any;
 import org.omg.CORBA.MARSHAL;
 import org.omg.CORBA.TypeCode;
@@ -101,7 +103,9 @@ public class _DynAnyFactoryStub
   public DynAny create_dyn_any(Any _0)
                         throws InconsistentTypeCode
   {
-    throw new MARSHAL(NOT_APPLICABLE);
+    MARSHAL m = new MARSHAL(NOT_APPLICABLE);
+    m.minor = Minor.Inappropriate;
+    throw m;
   }
 
   /**
@@ -113,7 +117,9 @@ public class _DynAnyFactoryStub
   public DynAny create_dyn_any_from_type_code(TypeCode _0)
                                        throws InconsistentTypeCode
   {
-    throw new MARSHAL(NOT_APPLICABLE);
+    MARSHAL m = new MARSHAL(NOT_APPLICABLE);
+    m.minor = Minor.Inappropriate;
+    throw m;
   }
 
   static String NOT_APPLICABLE =
diff --git a/org/omg/IOP/TaggedComponentHelper.java b/org/omg/IOP/TaggedComponentHelper.java
index 906d6390a..2ad22d479 100644
--- a/org/omg/IOP/TaggedComponentHelper.java
+++ b/org/omg/IOP/TaggedComponentHelper.java
@@ -38,6 +38,8 @@ exception statement from your version. */
 
 package org.omg.IOP;
 
+import gnu.CORBA.Minor;
+
 import org.omg.CORBA.Any;
 import org.omg.CORBA.BAD_OPERATION;
 import org.omg.CORBA.MARSHAL;
@@ -149,6 +151,7 @@ public abstract class TaggedComponentHelper
     catch (IOException e)
       {
         MARSHAL m = new MARSHAL();
+        m.minor = Minor.Encapsulation;
         m.initCause(e);
         throw m;
       }
@@ -175,6 +178,7 @@ public abstract class TaggedComponentHelper
     catch (IOException e)
       {
         MARSHAL m = new MARSHAL();
+        m.minor = Minor.Encapsulation;
         m.initCause(e);
         throw m;
       }
diff --git a/org/omg/IOP/TaggedProfileHelper.java b/org/omg/IOP/TaggedProfileHelper.java
index a23122eb9..7581111d8 100644
--- a/org/omg/IOP/TaggedProfileHelper.java
+++ b/org/omg/IOP/TaggedProfileHelper.java
@@ -38,6 +38,7 @@ exception statement from your version. */
 
 package org.omg.IOP;
 
+import gnu.CORBA.Minor;
 import gnu.CORBA.CDR.cdrBufInput;
 import gnu.CORBA.CDR.cdrBufOutput;
 
@@ -178,6 +179,7 @@ public abstract class TaggedProfileHelper
         catch (IOException e)
           {
             MARSHAL m = new MARSHAL();
+            m.minor = Minor.Encapsulation;
             m.initCause(e);
             throw m;
           }
diff --git a/org/omg/PortableInterceptor/CurrentHelper.java b/org/omg/PortableInterceptor/CurrentHelper.java
index b7a5a541e..b6bd087ca 100644
--- a/org/omg/PortableInterceptor/CurrentHelper.java
+++ b/org/omg/PortableInterceptor/CurrentHelper.java
@@ -38,6 +38,8 @@ exception statement from your version. */
 
 package org.omg.PortableInterceptor;
 
+import gnu.CORBA.Minor;
+
 import org.omg.CORBA.Any;
 import org.omg.CORBA.BAD_PARAM;
 import org.omg.CORBA.MARSHAL;
@@ -133,7 +135,9 @@ public abstract class CurrentHelper
    */
   public static Current read(InputStream input)
   {
-    throw new MARSHAL();
+    MARSHAL m = new MARSHAL("Inappropriate");
+    m.minor = Minor.Inappropriate;
+    throw m;
   }
 
   /**
@@ -145,6 +149,8 @@ public abstract class CurrentHelper
    */
   public static void write(OutputStream output, Current value)
   {
-    throw new MARSHAL();
+    MARSHAL m = new MARSHAL("Inappropriate");
+    m.minor = Minor.Inappropriate;
+    throw m;
   }
 }
\ No newline at end of file
diff --git a/org/omg/PortableServer/POAHelper.java b/org/omg/PortableServer/POAHelper.java
index 2928d9f07..3712da00d 100644
--- a/org/omg/PortableServer/POAHelper.java
+++ b/org/omg/PortableServer/POAHelper.java
@@ -38,6 +38,8 @@ exception statement from your version. */
 
 package org.omg.PortableServer;
 
+import gnu.CORBA.Minor;
+
 import org.omg.CORBA.BAD_PARAM;
 import org.omg.CORBA.TypeCode;
 import org.omg.CORBA.ORB;
@@ -126,7 +128,9 @@ public abstract class POAHelper
    */
   public static POA read(InputStream input)
   {
-    throw new MARSHAL("Not applicable");
+    MARSHAL m = new MARSHAL("Inappropriate");
+    m.minor = Minor.Inappropriate;
+    throw m;
   }
 
   /**
@@ -142,6 +146,8 @@ public abstract class POAHelper
    */
   public static void write(OutputStream output, POA value)
   {
-    throw new MARSHAL("Not applicable");
+    MARSHAL m = new MARSHAL("Inappropriate");
+    m.minor = Minor.Inappropriate;
+    throw m;
   }
 }
\ No newline at end of file
diff --git a/org/omg/PortableServer/ServantActivatorHelper.java b/org/omg/PortableServer/ServantActivatorHelper.java
index 1aab99cee..f2779b1b5 100644
--- a/org/omg/PortableServer/ServantActivatorHelper.java
+++ b/org/omg/PortableServer/ServantActivatorHelper.java
@@ -38,6 +38,8 @@ exception statement from your version. */
 
 package org.omg.PortableServer;
 
+import gnu.CORBA.Minor;
+
 import org.omg.CORBA.Any;
 import org.omg.CORBA.BAD_PARAM;
 import org.omg.CORBA.MARSHAL;
@@ -125,7 +127,9 @@ public abstract class ServantActivatorHelper
    */
   public static ServantActivator read(InputStream input)
   {
-    throw new MARSHAL();
+    MARSHAL m = new MARSHAL("Inappropriate");
+    m.minor = Minor.Inappropriate;
+    throw m;
   }
 
   /**
@@ -140,6 +144,8 @@ public abstract class ServantActivatorHelper
    */
   public static void write(OutputStream output, ServantActivator value)
   {
-    throw new MARSHAL();
+    MARSHAL m = new MARSHAL("Inappropriate");
+    m.minor = Minor.Inappropriate;
+    throw m;
   }
 }
\ No newline at end of file
diff --git a/org/omg/PortableServer/ServantLocatorHelper.java b/org/omg/PortableServer/ServantLocatorHelper.java
index 984abdffe..495e06cd2 100644
--- a/org/omg/PortableServer/ServantLocatorHelper.java
+++ b/org/omg/PortableServer/ServantLocatorHelper.java
@@ -38,6 +38,8 @@ exception statement from your version. */
 
 package org.omg.PortableServer;
 
+import gnu.CORBA.Minor;
+
 import org.omg.CORBA.Any;
 import org.omg.CORBA.BAD_OPERATION;
 import org.omg.CORBA.MARSHAL;
@@ -125,7 +127,9 @@ public abstract class ServantLocatorHelper
    */
   public static ServantLocator read(InputStream input)
   {
-    throw new MARSHAL();
+    MARSHAL m = new MARSHAL("Inappropriate");
+    m.minor = Minor.Inappropriate;
+    throw m;
   }
 
   /**
@@ -140,6 +144,8 @@ public abstract class ServantLocatorHelper
    */
   public static void write(OutputStream output, ServantLocator value)
   {
-    throw new MARSHAL();
+    MARSHAL m = new MARSHAL("Inappropriate");
+    m.minor = Minor.Inappropriate;
+    throw m;
   }
 }
\ No newline at end of file