Imported GNU Classpath 0.19 + gcj-import-20051115.

       * sources.am: Regenerated.
       * Makefile.in: Likewise.
       * scripts/makemake.tcl: Use glob -nocomplain.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@107049 138bc75d-0d04-0410-961f-82ee72b054a4

25 files changed, 138 insertions, 16 deletions

diff --git a/libjava/classpath/org/omg/PortableServer/CurrentPackage/NoContextHelper.java b/libjava/classpath/org/omg/PortableServer/CurrentPackage/NoContextHelper.java
index 0ba6352001f..848a3c3d3f6 100644
--- a/libjava/classpath/org/omg/PortableServer/CurrentPackage/NoContextHelper.java
+++ b/libjava/classpath/org/omg/PortableServer/CurrentPackage/NoContextHelper.java
@@ -39,6 +39,7 @@ exception statement from your version. */
 package org.omg.PortableServer.CurrentPackage;
 
 import gnu.CORBA.EmptyExceptionHolder;
+import gnu.CORBA.Minor;
 
 import org.omg.CORBA.Any;
 import org.omg.CORBA.BAD_OPERATION;
@@ -105,6 +106,7 @@ public abstract class NoContextHelper
     catch (ClassCastException cex)
       {
         BAD_OPERATION bad = new BAD_OPERATION("NoContext expected");
+        bad.minor = Minor.Any;        
         bad.initCause(cex);
         throw bad;
       }
diff --git a/libjava/classpath/org/omg/PortableServer/ForwardRequestHelper.java b/libjava/classpath/org/omg/PortableServer/ForwardRequestHelper.java
index 6f8d5ea6bf3..f4b0619b017 100644
--- a/libjava/classpath/org/omg/PortableServer/ForwardRequestHelper.java
+++ b/libjava/classpath/org/omg/PortableServer/ForwardRequestHelper.java
@@ -38,6 +38,7 @@ exception statement from your version. */
 
 package org.omg.PortableServer;
 
+import gnu.CORBA.Minor;
 import gnu.CORBA.Poa.ForwardRequestHolder;
 
 import org.omg.CORBA.Any;
@@ -80,6 +81,7 @@ public abstract class ForwardRequestHelper
     catch (ClassCastException cex)
       {
         BAD_OPERATION bad = new BAD_OPERATION("ForwardRequest expected");
+        bad.minor = Minor.Any;        
         bad.initCause(cex);
         throw bad;
       }
diff --git a/libjava/classpath/org/omg/PortableServer/IdAssignmentPolicyValue.java b/libjava/classpath/org/omg/PortableServer/IdAssignmentPolicyValue.java
index 2dda0ef2b61..ac81d389cdd 100644
--- a/libjava/classpath/org/omg/PortableServer/IdAssignmentPolicyValue.java
+++ b/libjava/classpath/org/omg/PortableServer/IdAssignmentPolicyValue.java
@@ -38,6 +38,8 @@ exception statement from your version. */
 
 package org.omg.PortableServer;
 
+import gnu.CORBA.Minor;
+
 import org.omg.CORBA.BAD_OPERATION;
 import org.omg.CORBA.portable.IDLEntity;
 
@@ -129,7 +131,9 @@ public class IdAssignmentPolicyValue
       }
     catch (ArrayIndexOutOfBoundsException ex)
       {
-        throw new BAD_OPERATION("Invalid enumeration code " + code);
+        BAD_OPERATION bad = new BAD_OPERATION("Invalid policy code " + code);
+        bad.minor = Minor.PolicyType;
+        throw bad;
       }
   }
 
diff --git a/libjava/classpath/org/omg/PortableServer/IdUniquenessPolicyValue.java b/libjava/classpath/org/omg/PortableServer/IdUniquenessPolicyValue.java
index d0992d9dbe2..c0f281249b0 100644
--- a/libjava/classpath/org/omg/PortableServer/IdUniquenessPolicyValue.java
+++ b/libjava/classpath/org/omg/PortableServer/IdUniquenessPolicyValue.java
@@ -38,6 +38,8 @@ exception statement from your version. */
 
 package org.omg.PortableServer;
 
+import gnu.CORBA.Minor;
+
 import org.omg.CORBA.BAD_OPERATION;
 import org.omg.CORBA.portable.IDLEntity;
 
@@ -129,7 +131,9 @@ public class IdUniquenessPolicyValue
       }
     catch (ArrayIndexOutOfBoundsException ex)
       {
-        throw new BAD_OPERATION("Invalid enumeration code " + code);
+        BAD_OPERATION bad = new BAD_OPERATION("Invalid policy code " + code);
+        bad.minor = Minor.PolicyType;
+        throw bad;
       }
   }
 
diff --git a/libjava/classpath/org/omg/PortableServer/ImplicitActivationPolicyValue.java b/libjava/classpath/org/omg/PortableServer/ImplicitActivationPolicyValue.java
index 8d2913bf66f..9d81d5fab81 100644
--- a/libjava/classpath/org/omg/PortableServer/ImplicitActivationPolicyValue.java
+++ b/libjava/classpath/org/omg/PortableServer/ImplicitActivationPolicyValue.java
@@ -38,6 +38,8 @@ exception statement from your version. */
 
 package org.omg.PortableServer;
 
+import gnu.CORBA.Minor;
+
 import org.omg.CORBA.BAD_OPERATION;
 import org.omg.CORBA.portable.IDLEntity;
 
@@ -129,7 +131,9 @@ public class ImplicitActivationPolicyValue
       }
     catch (ArrayIndexOutOfBoundsException ex)
       {
-        throw new BAD_OPERATION("Invalid enumeration code " + code);
+        BAD_OPERATION bad = new BAD_OPERATION("Invalid policy code " + code);
+        bad.minor = Minor.PolicyType;
+        throw bad;
       }
   }
 
diff --git a/libjava/classpath/org/omg/PortableServer/LifespanPolicyValue.java b/libjava/classpath/org/omg/PortableServer/LifespanPolicyValue.java
index 1e046c4e941..117eb5a3c9e 100644
--- a/libjava/classpath/org/omg/PortableServer/LifespanPolicyValue.java
+++ b/libjava/classpath/org/omg/PortableServer/LifespanPolicyValue.java
@@ -38,6 +38,8 @@ exception statement from your version. */
 
 package org.omg.PortableServer;
 
+import gnu.CORBA.Minor;
+
 import org.omg.CORBA.BAD_OPERATION;
 import org.omg.CORBA.portable.IDLEntity;
 
@@ -126,7 +128,9 @@ public class LifespanPolicyValue
       }
     catch (ArrayIndexOutOfBoundsException ex)
       {
-        throw new BAD_OPERATION("Invalid enumeration code " + code);
+        BAD_OPERATION bad = new BAD_OPERATION("Invalid policy code " + code);
+        bad.minor = Minor.PolicyType;
+        throw bad;
       }
   }
 
diff --git a/libjava/classpath/org/omg/PortableServer/POAHelper.java b/libjava/classpath/org/omg/PortableServer/POAHelper.java
index 2928d9f0737..3712da00d69 100644
--- a/libjava/classpath/org/omg/PortableServer/POAHelper.java
+++ b/libjava/classpath/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/libjava/classpath/org/omg/PortableServer/POAManagerPackage/AdapterInactiveHelper.java b/libjava/classpath/org/omg/PortableServer/POAManagerPackage/AdapterInactiveHelper.java
index db7b965bbad..2a587a4126b 100644
--- a/libjava/classpath/org/omg/PortableServer/POAManagerPackage/AdapterInactiveHelper.java
+++ b/libjava/classpath/org/omg/PortableServer/POAManagerPackage/AdapterInactiveHelper.java
@@ -39,6 +39,7 @@ exception statement from your version. */
 package org.omg.PortableServer.POAManagerPackage;
 
 import gnu.CORBA.EmptyExceptionHolder;
+import gnu.CORBA.Minor;
 
 import org.omg.CORBA.Any;
 import org.omg.CORBA.BAD_OPERATION;
@@ -106,6 +107,7 @@ public abstract class AdapterInactiveHelper
     catch (ClassCastException cex)
       {
         BAD_OPERATION bad = new BAD_OPERATION("AdapterInactive expected");
+        bad.minor = Minor.Any;        
         bad.initCause(cex);
         throw bad;
       }
diff --git a/libjava/classpath/org/omg/PortableServer/POAManagerPackage/State.java b/libjava/classpath/org/omg/PortableServer/POAManagerPackage/State.java
index 536189a0ce2..9e856098b0b 100644
--- a/libjava/classpath/org/omg/PortableServer/POAManagerPackage/State.java
+++ b/libjava/classpath/org/omg/PortableServer/POAManagerPackage/State.java
@@ -38,6 +38,8 @@ exception statement from your version. */
 
 package org.omg.PortableServer.POAManagerPackage;
 
+import gnu.CORBA.Minor;
+
 import org.omg.CORBA.BAD_OPERATION;
 import org.omg.CORBA.portable.IDLEntity;
 
@@ -140,7 +142,7 @@ public class State
 
   /**
    * Returns the State, matching the given integer constant.
-   *
+   * 
    * @param code one of _HOLDING, _ACTIVE, _DISCARDING, _INACTIVE.
    * @return one of HOLDING, ACTIVE, DISCARDING, INACTIVE.
    * @throws BAD_PARAM if the parameter is not one of the valid values.
@@ -149,16 +151,19 @@ public class State
   {
     try
       {
-        return enume [ code ];
+        return enume[code];
       }
     catch (ArrayIndexOutOfBoundsException ex)
       {
-        throw new BAD_OPERATION("Invalid enumeration code " + code);
+        BAD_OPERATION bad = new BAD_OPERATION("Invalid state " + code);
+        bad.minor = Minor.Enumeration;
+        throw bad;
       }
   }
 
   /**
    * Returns a short string representation.
+   * 
    * @return the name of the current enumeration value.
    */
   public String toString()
diff --git a/libjava/classpath/org/omg/PortableServer/POAPackage/AdapterAlreadyExistsHelper.java b/libjava/classpath/org/omg/PortableServer/POAPackage/AdapterAlreadyExistsHelper.java
index 3ffee4ff85a..61a41089191 100644
--- a/libjava/classpath/org/omg/PortableServer/POAPackage/AdapterAlreadyExistsHelper.java
+++ b/libjava/classpath/org/omg/PortableServer/POAPackage/AdapterAlreadyExistsHelper.java
@@ -39,6 +39,7 @@ exception statement from your version. */
 package org.omg.PortableServer.POAPackage;
 
 import gnu.CORBA.EmptyExceptionHolder;
+import gnu.CORBA.Minor;
 
 import org.omg.CORBA.Any;
 import org.omg.CORBA.BAD_OPERATION;
@@ -107,6 +108,7 @@ public abstract class AdapterAlreadyExistsHelper
     catch (ClassCastException cex)
       {
         BAD_OPERATION bad = new BAD_OPERATION("AdapterAlreadyExists expected");
+        bad.minor = Minor.Any;
         bad.initCause(cex);
         throw bad;
       }
diff --git a/libjava/classpath/org/omg/PortableServer/POAPackage/AdapterNonExistentHelper.java b/libjava/classpath/org/omg/PortableServer/POAPackage/AdapterNonExistentHelper.java
index f05daec3d83..dd318bf09cb 100644
--- a/libjava/classpath/org/omg/PortableServer/POAPackage/AdapterNonExistentHelper.java
+++ b/libjava/classpath/org/omg/PortableServer/POAPackage/AdapterNonExistentHelper.java
@@ -39,6 +39,7 @@ exception statement from your version. */
 package org.omg.PortableServer.POAPackage;
 
 import gnu.CORBA.EmptyExceptionHolder;
+import gnu.CORBA.Minor;
 
 import org.omg.CORBA.Any;
 import org.omg.CORBA.BAD_OPERATION;
@@ -106,6 +107,7 @@ public abstract class AdapterNonExistentHelper
     catch (ClassCastException cex)
       {
         BAD_OPERATION bad = new BAD_OPERATION("AdapterNonExistent expected");
+        bad.minor = Minor.Any;        
         bad.initCause(cex);
         throw bad;
       }
diff --git a/libjava/classpath/org/omg/PortableServer/POAPackage/InvalidPolicyHelper.java b/libjava/classpath/org/omg/PortableServer/POAPackage/InvalidPolicyHelper.java
index 15aa62d8201..5e9e627c73f 100644
--- a/libjava/classpath/org/omg/PortableServer/POAPackage/InvalidPolicyHelper.java
+++ b/libjava/classpath/org/omg/PortableServer/POAPackage/InvalidPolicyHelper.java
@@ -38,6 +38,7 @@ exception statement from your version. */
 
 package org.omg.PortableServer.POAPackage;
 
+import gnu.CORBA.Minor;
 import gnu.CORBA.Poa.InvalidPolicyHolder;
 
 import org.omg.CORBA.Any;
@@ -110,6 +111,7 @@ public abstract class InvalidPolicyHelper
     catch (ClassCastException cex)
       {
         BAD_OPERATION bad = new BAD_OPERATION("InvalidPolicy expected");
+        bad.minor = Minor.Any;        
         bad.initCause(cex);
         throw bad;
       }
diff --git a/libjava/classpath/org/omg/PortableServer/POAPackage/NoServantHelper.java b/libjava/classpath/org/omg/PortableServer/POAPackage/NoServantHelper.java
index 26b21ce6c10..fd2c189fc14 100644
--- a/libjava/classpath/org/omg/PortableServer/POAPackage/NoServantHelper.java
+++ b/libjava/classpath/org/omg/PortableServer/POAPackage/NoServantHelper.java
@@ -39,6 +39,7 @@ exception statement from your version. */
 package org.omg.PortableServer.POAPackage;
 
 import gnu.CORBA.EmptyExceptionHolder;
+import gnu.CORBA.Minor;
 
 import org.omg.CORBA.Any;
 import org.omg.CORBA.BAD_OPERATION;
@@ -106,6 +107,7 @@ public abstract class NoServantHelper
     catch (ClassCastException cex)
       {
         BAD_OPERATION bad = new BAD_OPERATION("NoServant expected");
+        bad.minor = Minor.Any;        
         bad.initCause(cex);
         throw bad;
       }
diff --git a/libjava/classpath/org/omg/PortableServer/POAPackage/ObjectAlreadyActiveHelper.java b/libjava/classpath/org/omg/PortableServer/POAPackage/ObjectAlreadyActiveHelper.java
index 99891dbe5c3..011867473ee 100644
--- a/libjava/classpath/org/omg/PortableServer/POAPackage/ObjectAlreadyActiveHelper.java
+++ b/libjava/classpath/org/omg/PortableServer/POAPackage/ObjectAlreadyActiveHelper.java
@@ -39,6 +39,7 @@ exception statement from your version. */
 package org.omg.PortableServer.POAPackage;
 
 import gnu.CORBA.EmptyExceptionHolder;
+import gnu.CORBA.Minor;
 
 import org.omg.CORBA.Any;
 import org.omg.CORBA.BAD_OPERATION;
@@ -107,6 +108,7 @@ public abstract class ObjectAlreadyActiveHelper
     catch (ClassCastException cex)
       {
         BAD_OPERATION bad = new BAD_OPERATION("ObjectAlreadyActive expected");
+        bad.minor = Minor.Any;        
         bad.initCause(cex);
         throw bad;
       }
diff --git a/libjava/classpath/org/omg/PortableServer/POAPackage/ObjectNotActiveHelper.java b/libjava/classpath/org/omg/PortableServer/POAPackage/ObjectNotActiveHelper.java
index 867d5f4f641..0d8ff473cf3 100644
--- a/libjava/classpath/org/omg/PortableServer/POAPackage/ObjectNotActiveHelper.java
+++ b/libjava/classpath/org/omg/PortableServer/POAPackage/ObjectNotActiveHelper.java
@@ -39,6 +39,7 @@ exception statement from your version. */
 package org.omg.PortableServer.POAPackage;
 
 import gnu.CORBA.EmptyExceptionHolder;
+import gnu.CORBA.Minor;
 
 import org.omg.CORBA.Any;
 import org.omg.CORBA.BAD_OPERATION;
@@ -106,6 +107,7 @@ public abstract class ObjectNotActiveHelper
     catch (ClassCastException cex)
       {
         BAD_OPERATION bad = new BAD_OPERATION("ObjectNotActive expected");
+        bad.minor = Minor.Any;        
         bad.initCause(cex);
         throw bad;
       }
diff --git a/libjava/classpath/org/omg/PortableServer/POAPackage/ServantAlreadyActiveHelper.java b/libjava/classpath/org/omg/PortableServer/POAPackage/ServantAlreadyActiveHelper.java
index 0db0e938b69..a74e674012a 100644
--- a/libjava/classpath/org/omg/PortableServer/POAPackage/ServantAlreadyActiveHelper.java
+++ b/libjava/classpath/org/omg/PortableServer/POAPackage/ServantAlreadyActiveHelper.java
@@ -39,6 +39,7 @@ exception statement from your version. */
 package org.omg.PortableServer.POAPackage;
 
 import gnu.CORBA.EmptyExceptionHolder;
+import gnu.CORBA.Minor;
 
 import org.omg.CORBA.Any;
 import org.omg.CORBA.BAD_OPERATION;
@@ -107,6 +108,7 @@ public abstract class ServantAlreadyActiveHelper
     catch (ClassCastException cex)
       {
         BAD_OPERATION bad = new BAD_OPERATION("ServantAlreadyActive expected");
+        bad.minor = Minor.Any;        
         bad.initCause(cex);
         throw bad;
       }
diff --git a/libjava/classpath/org/omg/PortableServer/POAPackage/ServantNotActiveHelper.java b/libjava/classpath/org/omg/PortableServer/POAPackage/ServantNotActiveHelper.java
index 429421853ba..5fb52cf35b1 100644
--- a/libjava/classpath/org/omg/PortableServer/POAPackage/ServantNotActiveHelper.java
+++ b/libjava/classpath/org/omg/PortableServer/POAPackage/ServantNotActiveHelper.java
@@ -39,6 +39,7 @@ exception statement from your version. */
 package org.omg.PortableServer.POAPackage;
 
 import gnu.CORBA.EmptyExceptionHolder;
+import gnu.CORBA.Minor;
 
 import org.omg.CORBA.Any;
 import org.omg.CORBA.BAD_OPERATION;
@@ -106,6 +107,7 @@ public abstract class ServantNotActiveHelper
     catch (ClassCastException cex)
       {
         BAD_OPERATION bad = new BAD_OPERATION("ServantNotActive expected");
+        bad.minor = Minor.Any;        
         bad.initCause(cex);
         throw bad;
       }
diff --git a/libjava/classpath/org/omg/PortableServer/POAPackage/WrongAdapterHelper.java b/libjava/classpath/org/omg/PortableServer/POAPackage/WrongAdapterHelper.java
index ebba304a536..cd862b0814b 100644
--- a/libjava/classpath/org/omg/PortableServer/POAPackage/WrongAdapterHelper.java
+++ b/libjava/classpath/org/omg/PortableServer/POAPackage/WrongAdapterHelper.java
@@ -39,6 +39,7 @@ exception statement from your version. */
 package org.omg.PortableServer.POAPackage;
 
 import gnu.CORBA.EmptyExceptionHolder;
+import gnu.CORBA.Minor;
 
 import org.omg.CORBA.Any;
 import org.omg.CORBA.BAD_OPERATION;
@@ -106,6 +107,7 @@ public abstract class WrongAdapterHelper
     catch (ClassCastException cex)
       {
         BAD_OPERATION bad = new BAD_OPERATION("WrongAdapter expected");
+        bad.minor = Minor.Any;        
         bad.initCause(cex);
         throw bad;
       }
diff --git a/libjava/classpath/org/omg/PortableServer/POAPackage/WrongPolicyHelper.java b/libjava/classpath/org/omg/PortableServer/POAPackage/WrongPolicyHelper.java
index 5460d0ea79d..a1f27cbb0eb 100644
--- a/libjava/classpath/org/omg/PortableServer/POAPackage/WrongPolicyHelper.java
+++ b/libjava/classpath/org/omg/PortableServer/POAPackage/WrongPolicyHelper.java
@@ -39,6 +39,7 @@ exception statement from your version. */
 package org.omg.PortableServer.POAPackage;
 
 import gnu.CORBA.EmptyExceptionHolder;
+import gnu.CORBA.Minor;
 
 import org.omg.CORBA.Any;
 import org.omg.CORBA.BAD_OPERATION;
@@ -106,6 +107,7 @@ public abstract class WrongPolicyHelper
     catch (ClassCastException cex)
       {
         BAD_OPERATION bad = new BAD_OPERATION("WrongPolicy expected");
+        bad.minor = Minor.Any;        
         bad.initCause(cex);
         throw bad;
       }
diff --git a/libjava/classpath/org/omg/PortableServer/RequestProcessingPolicyValue.java b/libjava/classpath/org/omg/PortableServer/RequestProcessingPolicyValue.java
index 139010c86e8..0b1ce4d0bfa 100644
--- a/libjava/classpath/org/omg/PortableServer/RequestProcessingPolicyValue.java
+++ b/libjava/classpath/org/omg/PortableServer/RequestProcessingPolicyValue.java
@@ -38,6 +38,8 @@ exception statement from your version. */
 
 package org.omg.PortableServer;
 
+import gnu.CORBA.Minor;
+
 import org.omg.CORBA.BAD_OPERATION;
 import org.omg.CORBA.portable.IDLEntity;
 
@@ -151,7 +153,9 @@ public class RequestProcessingPolicyValue
       }
     catch (ArrayIndexOutOfBoundsException ex)
       {
-        throw new BAD_OPERATION("Invalid enumeration code " + code);
+        BAD_OPERATION bad = new BAD_OPERATION("Invalid policy code " + code);
+        bad.minor = Minor.PolicyType;
+        throw bad;
       }
   }
 
diff --git a/libjava/classpath/org/omg/PortableServer/Servant.java b/libjava/classpath/org/omg/PortableServer/Servant.java
index 745fc8a7ed4..5c99ee1a0e3 100644
--- a/libjava/classpath/org/omg/PortableServer/Servant.java
+++ b/libjava/classpath/org/omg/PortableServer/Servant.java
@@ -45,6 +45,8 @@ import org.omg.CORBA.ORB;
 import org.omg.PortableServer.POAPackage.ServantNotActive;
 import org.omg.PortableServer.POAPackage.WrongPolicy;
 import org.omg.PortableServer.portable.Delegate;
+
+import gnu.CORBA.Minor;
 import gnu.CORBA.Poa.ORB_1_4;
 import gnu.CORBA.Poa.gnuPOA;
 
@@ -239,6 +241,7 @@ public abstract class Servant
             catch (WrongPolicy unexp)
               {
                 BAD_OPERATION bad = new BAD_OPERATION();
+                bad.minor = Minor.Policy;
                 bad.initCause(unexp);
                 throw bad;
               }
@@ -253,6 +256,7 @@ public abstract class Servant
                     unexp.initCause(ex);
 
                     BAD_OPERATION bad = new BAD_OPERATION();
+                    bad.minor = Minor.Activation;
                     bad.initCause(unexp);
                     throw bad;
                   }
diff --git a/libjava/classpath/org/omg/PortableServer/ServantActivatorHelper.java b/libjava/classpath/org/omg/PortableServer/ServantActivatorHelper.java
index 1aab99cee4c..8aa58b2f627 100644
--- a/libjava/classpath/org/omg/PortableServer/ServantActivatorHelper.java
+++ b/libjava/classpath/org/omg/PortableServer/ServantActivatorHelper.java
@@ -38,7 +38,10 @@ 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.BAD_PARAM;
 import org.omg.CORBA.MARSHAL;
 import org.omg.CORBA.ORB;
@@ -112,6 +115,26 @@ public abstract class ServantActivatorHelper
         throw bad;
       }
   }
+  
+  /**
+   * Narrow the given object to the ServantActivator. For the objects that are
+   * always local, this operation does not differ from the ordinary
+   * {@link #narrow} (ClassCastException will be thrown if narrowing something
+   * different).
+   * 
+   * @param obj the object to cast.
+   * 
+   * @return the casted ServantActivator.
+   * 
+   * @since 1.5 
+   * 
+   * @see OMG issue 4158.
+   */
+  public static ServantActivator unchecked_narrow(org.omg.CORBA.Object obj)
+  {
+    return narrow(obj);
+  }  
+  
 
   /**
    * This should read the servant activator, but it cannot be transferred
@@ -125,7 +148,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 +165,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/libjava/classpath/org/omg/PortableServer/ServantLocatorHelper.java b/libjava/classpath/org/omg/PortableServer/ServantLocatorHelper.java
index 984abdffe69..082c4c586ee 100644
--- a/libjava/classpath/org/omg/PortableServer/ServantLocatorHelper.java
+++ b/libjava/classpath/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;
@@ -108,10 +110,30 @@ public abstract class ServantLocatorHelper
     catch (ClassCastException ex)
       {
         BAD_OPERATION bad = new BAD_OPERATION();
+        bad.minor = Minor.ClassCast;
         bad.initCause(ex);
         throw bad;
       }
   }
+  
+  /**
+   * Narrow the given object to the ServantLocator. For the objects that are
+   * always local, this operation does not differ from the ordinary
+   * {@link #narrow} (ClassCastException will be thrown if narrowing something
+   * different).
+   * 
+   * @param obj the object to cast.
+   * 
+   * @return the casted ServantLocator.
+   * 
+   * @since 1.5
+   * 
+   * @see OMG issue 4158.
+   */
+  public static ServantLocator unchecked_narrow(org.omg.CORBA.Object obj)
+  {
+    return narrow(obj);
+  }    
 
   /**
    * This should read the servant locator, but it cannot be transferred
@@ -125,7 +147,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 +164,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
diff --git a/libjava/classpath/org/omg/PortableServer/ServantRetentionPolicyValue.java b/libjava/classpath/org/omg/PortableServer/ServantRetentionPolicyValue.java
index caf8132e638..0b6ecf62fe1 100644
--- a/libjava/classpath/org/omg/PortableServer/ServantRetentionPolicyValue.java
+++ b/libjava/classpath/org/omg/PortableServer/ServantRetentionPolicyValue.java
@@ -38,6 +38,8 @@ exception statement from your version. */
 
 package org.omg.PortableServer;
 
+import gnu.CORBA.Minor;
+
 import org.omg.CORBA.BAD_OPERATION;
 import org.omg.CORBA.portable.IDLEntity;
 
@@ -126,7 +128,9 @@ public class ServantRetentionPolicyValue
       }
     catch (ArrayIndexOutOfBoundsException ex)
       {
-        throw new BAD_OPERATION("Invalid enumeration code " + code);
+        BAD_OPERATION bad = new BAD_OPERATION("Invalid policy code " + code);
+        bad.minor = Minor.PolicyType;
+        throw bad;
       }
   }
 
diff --git a/libjava/classpath/org/omg/PortableServer/ThreadPolicyValue.java b/libjava/classpath/org/omg/PortableServer/ThreadPolicyValue.java
index c7d4d636726..5c771a7d624 100644
--- a/libjava/classpath/org/omg/PortableServer/ThreadPolicyValue.java
+++ b/libjava/classpath/org/omg/PortableServer/ThreadPolicyValue.java
@@ -38,6 +38,8 @@ exception statement from your version. */
 
 package org.omg.PortableServer;
 
+import gnu.CORBA.Minor;
+
 import org.omg.CORBA.BAD_OPERATION;
 import org.omg.CORBA.portable.IDLEntity;
 
@@ -139,7 +141,9 @@ public class ThreadPolicyValue
       }
     catch (ArrayIndexOutOfBoundsException ex)
       {
-        throw new BAD_OPERATION("Invalid enumeration code " + code);
+        BAD_OPERATION bad = new BAD_OPERATION("Invalid policy code " + code);
+        bad.minor = Minor.PolicyType;
+        throw bad;
       }
   }