Index: gnu/CORBA/Functional_ORB.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/CORBA/Functional_ORB.java,v
retrieving revision 1.9
diff -u -r1.9 Functional_ORB.java
--- gnu/CORBA/Functional_ORB.java	1 Jun 2005 10:43:09 -0000	1.9
+++ gnu/CORBA/Functional_ORB.java	3 Jun 2005 14:33:24 -0000
@@ -102,7 +102,6 @@
   class portServer
     extends Thread
   {
-
     /**
      * The number of the currently running parallel threads.
      */
@@ -145,7 +144,10 @@
         }
       catch (IOException ex)
         {
-          throw new BAD_OPERATION("Unable to open the server socket.");
+          BAD_OPERATION bad =
+            new BAD_OPERATION("Unable to open the server socket.");
+          bad.initCause(ex);
+          throw bad;
         }
 
       while (running)
@@ -372,7 +374,10 @@
       }
     catch (UnknownHostException ex)
       {
-        throw new BAD_OPERATION("Unable to resolve the local host address.");
+        BAD_OPERATION bad =
+          new BAD_OPERATION("Unable to open the server socket.");
+        bad.initCause(ex);
+        throw bad;
       }
   }
 
@@ -455,13 +460,15 @@
         s.close();
         return a_port;
       }
-    catch (IOException ex1)
+    catch (IOException ex)
       {
-        throw new NO_RESOURCES("Unable to open the server socket");
+        NO_RESOURCES bad =
+          new NO_RESOURCES("Unable to open the server socket.");
+        bad.initCause(ex);
+        throw bad;
       }
   }
 
-
   /**
    * Set the port, on that the server is listening for the client requests.
    * In this implementation, the server is listening at only one port,
@@ -731,7 +738,9 @@
       }
     catch (Exception ex)
       {
-        throw new InvalidName(name + ":" + ex.getMessage());
+        InvalidName err = new InvalidName(name);
+        err.initCause(ex);
+        throw err;
       }
     if (object != null)
       return object;
@@ -921,10 +930,13 @@
               }
             catch (NumberFormatException ex)
               {
-                throw new BAD_PARAM("Invalid " + NS_PORT +
-                                    "property, unable to parse '" +
-                                    props.getProperty(NS_PORT) + "'"
-                                   );
+                BAD_PARAM bad =
+                  new BAD_PARAM("Invalid " + NS_PORT +
+                                "property, unable to parse '" +
+                                props.getProperty(NS_PORT) + "'"
+                               );
+                bad.initCause(ex);
+                throw bad;
               }
           }
       }
@@ -1238,7 +1250,8 @@
 
                 try
                   {
-                    if (no_resources) throw new NO_RESOURCES();
+                    if (no_resources)
+                      throw new NO_RESOURCES();
                     if (target == null)
                       throw new OBJECT_NOT_EXIST();
                     target._invoke(rh_request.operation, cin, handler);
Index: gnu/CORBA/IOR_Delegate.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/CORBA/IOR_Delegate.java,v
retrieving revision 1.1
diff -u -r1.1 IOR_Delegate.java
--- gnu/CORBA/IOR_Delegate.java	15 May 2005 01:09:29 -0000	1.1
+++ gnu/CORBA/IOR_Delegate.java	3 Jun 2005 14:28:22 -0000
@@ -211,7 +211,9 @@
                 }
               catch (IOException ex)
                 {
-                  throw new MARSHAL(ex + " while reading the forwarding info");
+                  MARSHAL t = new MARSHAL("Cant read forwarding info");
+                  t.initCause(ex);
+                  throw t;
                 }
 
               request.request.setIor(forwarded);
Index: gnu/CORBA/Simple_delegate.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/CORBA/Simple_delegate.java,v
retrieving revision 1.1
diff -u -r1.1 Simple_delegate.java
--- gnu/CORBA/Simple_delegate.java	15 May 2005 01:09:29 -0000	1.1
+++ gnu/CORBA/Simple_delegate.java	3 Jun 2005 14:28:22 -0000
@@ -238,13 +238,12 @@
   }
 
   /**
-   * Not implemented for this delegate.
+   * This should never be called this type delegate.
    *
-   * @throws NO_IMPLEMENT, always.
+   * @throws InternalError, always.
    */
   public Request request(org.omg.CORBA.Object target, String operation)
   {
-    /**@todo Implement this org.omg.CORBA.portable.Delegate abstract method*/
-    throw new java.lang.UnsupportedOperationException("Method request() not yet implemented.");
+    throw new InternalError();
   }
 }
Index: gnu/CORBA/universalHolder.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/CORBA/universalHolder.java,v
retrieving revision 1.1
diff -u -r1.1 universalHolder.java
--- gnu/CORBA/universalHolder.java	22 May 2005 12:20:58 -0000	1.1
+++ gnu/CORBA/universalHolder.java	3 Jun 2005 14:31:22 -0000
@@ -109,7 +109,9 @@
       }
     catch (IOException ex)
       {
-        throw new MARSHAL(ex.getClass().getName() + ":" + ex.getMessage());
+        MARSHAL t = new MARSHAL();
+        t.initCause(ex);
+        throw t;
       }
   }
 
@@ -139,7 +141,9 @@
       }
     catch (IOException ex)
       {
-        throw new MARSHAL(ex.getClass().getName() + ":" + ex.getMessage());
+        MARSHAL t = new MARSHAL();
+        t.initCause(ex);
+        throw t;
       }
   }
 
Index: gnu/CORBA/CDR/aligningInputStream.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/CORBA/CDR/aligningInputStream.java,v
retrieving revision 1.2
diff -u -r1.2 aligningInputStream.java
--- gnu/CORBA/CDR/aligningInputStream.java	22 May 2005 12:20:58 -0000	1.2
+++ gnu/CORBA/CDR/aligningInputStream.java	3 Jun 2005 14:28:22 -0000
@@ -106,7 +106,9 @@
       }
     catch (Exception ex)
       {
-        throw new BAD_PARAM("Unable to align at " + alignment);
+        BAD_PARAM p = new BAD_PARAM("Unable to align at " + alignment);
+        p.initCause(ex);
+        throw p;
       }
   }
 
Index: gnu/CORBA/CDR/aligningOutputStream.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/CORBA/CDR/aligningOutputStream.java,v
retrieving revision 1.1
diff -u -r1.1 aligningOutputStream.java
--- gnu/CORBA/CDR/aligningOutputStream.java	15 May 2005 01:09:29 -0000	1.1
+++ gnu/CORBA/CDR/aligningOutputStream.java	3 Jun 2005 14:28:22 -0000
@@ -100,7 +100,9 @@
       }
     catch (Exception ex)
       {
-        throw new BAD_PARAM("Unable to align at " + alignment);
+        BAD_PARAM p = new BAD_PARAM("Unable to align at " + alignment);
+        p.initCause(ex);
+        throw p;
       }
   }
 
Index: gnu/CORBA/CDR/cdrInput.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/CORBA/CDR/cdrInput.java,v
retrieving revision 1.4
diff -u -r1.4 cdrInput.java
--- gnu/CORBA/CDR/cdrInput.java	1 Jun 2005 11:27:14 -0000	1.4
+++ gnu/CORBA/CDR/cdrInput.java	3 Jun 2005 14:28:22 -0000
@@ -245,7 +245,9 @@
       }
     catch (EOFException ex)
       {
-        throw new MARSHAL(UNEXP_EOF);
+        MARSHAL t = new MARSHAL(UNEXP_EOF);
+        t.initCause(ex);
+        throw t;
       }
     catch (IOException ex)
       {
@@ -266,7 +268,9 @@
       }
     catch (EOFException ex)
       {
-        throw new MARSHAL(UNEXP_EOF);
+        MARSHAL t = new MARSHAL(UNEXP_EOF);
+        t.initCause(ex);
+        throw t;
       }
 
     catch (IOException ex)
@@ -296,7 +300,9 @@
       }
     catch (EOFException ex)
       {
-        throw new MARSHAL(UNEXP_EOF);
+        MARSHAL t = new MARSHAL(UNEXP_EOF);
+        t.initCause(ex);
+        throw t;
       }
   }
 
@@ -312,7 +318,9 @@
       }
     catch (EOFException ex)
       {
-        throw new MARSHAL(UNEXP_EOF);
+        MARSHAL t = new MARSHAL(UNEXP_EOF);
+        t.initCause(ex);
+        throw t;
       }
   }
 
@@ -328,7 +336,9 @@
       }
     catch (EOFException ex)
       {
-        throw new MARSHAL(UNEXP_EOF);
+        MARSHAL t = new MARSHAL(UNEXP_EOF);
+        t.initCause(ex);
+        throw t;
       }
   }
 
@@ -380,7 +390,9 @@
       }
     catch (IOException ex)
       {
-        throw new BAD_OPERATION(ex.toString());
+        BAD_OPERATION bad = new BAD_OPERATION();
+        bad.initCause(ex);
+        throw bad;
       }
   }
 
@@ -430,7 +442,9 @@
       }
     catch (EOFException ex)
       {
-        throw new MARSHAL(UNEXP_EOF);
+        MARSHAL t = new MARSHAL(UNEXP_EOF);
+        t.initCause(ex);
+        throw t;
       }
     catch (IOException ex)
       {
@@ -452,7 +466,9 @@
       }
     catch (EOFException ex)
       {
-        throw new MARSHAL(UNEXP_EOF);
+        MARSHAL t = new MARSHAL(UNEXP_EOF);
+        t.initCause(ex);
+        throw t;
       }
 
     catch (IOException ex)
@@ -476,7 +492,9 @@
       }
     catch (EOFException ex)
       {
-        throw new MARSHAL(UNEXP_EOF);
+        MARSHAL t = new MARSHAL(UNEXP_EOF);
+        t.initCause(ex);
+        throw t;
       }
 
     catch (IOException ex)
@@ -506,7 +524,9 @@
       }
     catch (EOFException ex)
       {
-        throw new MARSHAL(UNEXP_EOF);
+        MARSHAL t = new MARSHAL(UNEXP_EOF);
+        t.initCause(ex);
+        throw t;
       }
 
     catch (IOException ex)
@@ -527,7 +547,9 @@
       }
     catch (EOFException ex)
       {
-        throw new MARSHAL(UNEXP_EOF);
+        MARSHAL t = new MARSHAL(UNEXP_EOF);
+        t.initCause(ex);
+        throw t;
       }
 
     catch (IOException ex)
@@ -551,7 +573,9 @@
       }
     catch (EOFException ex)
       {
-        throw new MARSHAL(UNEXP_EOF);
+        MARSHAL t = new MARSHAL(UNEXP_EOF);
+        t.initCause(ex);
+        throw t;
       }
 
     catch (IOException ex)
@@ -594,7 +618,9 @@
       }
     catch (EOFException ex)
       {
-        throw new MARSHAL(UNEXP_EOF);
+        MARSHAL t = new MARSHAL(UNEXP_EOF);
+        t.initCause(ex);
+        throw t;
       }
 
     catch (IOException ex)
@@ -616,7 +642,9 @@
       }
     catch (EOFException ex)
       {
-        throw new MARSHAL(UNEXP_EOF);
+        MARSHAL t = new MARSHAL(UNEXP_EOF);
+        t.initCause(ex);
+        throw t;
       }
 
     catch (IOException ex)
@@ -637,7 +665,9 @@
       }
     catch (EOFException ex)
       {
-        throw new MARSHAL(UNEXP_EOF);
+        MARSHAL t = new MARSHAL(UNEXP_EOF);
+        t.initCause(ex);
+        throw t;
       }
 
     catch (IOException ex)
@@ -661,7 +691,9 @@
       }
     catch (EOFException ex)
       {
-        throw new MARSHAL(UNEXP_EOF);
+        MARSHAL t = new MARSHAL(UNEXP_EOF);
+        t.initCause(ex);
+        throw t;
       }
 
     catch (IOException ex)
@@ -682,7 +714,9 @@
       }
     catch (EOFException ex)
       {
-        throw new MARSHAL(UNEXP_EOF);
+        MARSHAL t = new MARSHAL(UNEXP_EOF);
+        t.initCause(ex);
+        throw t;
       }
 
     catch (IOException ex)
@@ -706,7 +740,9 @@
       }
     catch (EOFException ex)
       {
-        throw new MARSHAL(UNEXP_EOF);
+        MARSHAL t = new MARSHAL(UNEXP_EOF);
+        t.initCause(ex);
+        throw t;
       }
 
     catch (IOException ex)
@@ -751,7 +787,9 @@
       }
     catch (EOFException ex)
       {
-        throw new MARSHAL(UNEXP_EOF);
+        MARSHAL t = new MARSHAL(UNEXP_EOF);
+        t.initCause(ex);
+        throw t;
       }
 
     catch (IOException ex)
@@ -771,7 +809,9 @@
       }
     catch (EOFException ex)
       {
-        throw new MARSHAL(UNEXP_EOF);
+        MARSHAL t = new MARSHAL(UNEXP_EOF);
+        t.initCause(ex);
+        throw t;
       }
 
     catch (IOException ex)
@@ -791,7 +831,9 @@
       }
     catch (EOFException ex)
       {
-        throw new MARSHAL(UNEXP_EOF);
+        MARSHAL t = new MARSHAL(UNEXP_EOF);
+        t.initCause(ex);
+        throw t;
       }
 
     catch (IOException ex)
@@ -818,7 +860,9 @@
       }
     catch (EOFException ex)
       {
-        throw new MARSHAL(UNEXP_EOF);
+        MARSHAL t = new MARSHAL(UNEXP_EOF);
+        t.initCause(ex);
+        throw t;
       }
 
     catch (IOException ex)
@@ -839,7 +883,9 @@
       }
     catch (EOFException ex)
       {
-        throw new MARSHAL(UNEXP_EOF);
+        MARSHAL t = new MARSHAL(UNEXP_EOF);
+        t.initCause(ex);
+        throw t;
       }
 
     catch (IOException ex)
@@ -863,7 +909,9 @@
       }
     catch (EOFException ex)
       {
-        throw new MARSHAL(UNEXP_EOF);
+        MARSHAL t = new MARSHAL(UNEXP_EOF);
+        t.initCause(ex);
+        throw t;
       }
 
     catch (IOException ex)
@@ -898,7 +946,9 @@
       }
     catch (EOFException ex)
       {
-        throw new MARSHAL(UNEXP_EOF);
+        MARSHAL t = new MARSHAL(UNEXP_EOF);
+        t.initCause(ex);
+        throw t;
       }
 
     catch (IOException ex)
@@ -986,7 +1036,9 @@
       }
     catch (EOFException ex)
       {
-        throw new MARSHAL(UNEXP_EOF);
+        MARSHAL t = new MARSHAL(UNEXP_EOF);
+        t.initCause(ex);
+        throw t;
       }
     catch (IOException ex)
       {
@@ -1019,7 +1071,9 @@
       }
     catch (EOFException ex)
       {
-        throw new MARSHAL(UNEXP_EOF);
+        MARSHAL t = new MARSHAL(UNEXP_EOF);
+        t.initCause(ex);
+        throw t;
       }
 
     catch (IOException ex)
@@ -1054,7 +1108,9 @@
       }
     catch (EOFException ex)
       {
-        throw new MARSHAL(UNEXP_EOF);
+        MARSHAL t = new MARSHAL(UNEXP_EOF);
+        t.initCause(ex);
+        throw t;
       }
 
     catch (IOException ex)
@@ -1108,7 +1164,9 @@
       }
     catch (EOFException ex)
       {
-        throw new MARSHAL(UNEXP_EOF);
+        MARSHAL t = new MARSHAL(UNEXP_EOF);
+        t.initCause(ex);
+        throw t;
       }
 
     catch (IOException ex)
Index: gnu/CORBA/CDR/cdrOutput.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/CORBA/CDR/cdrOutput.java,v
retrieving revision 1.3
diff -u -r1.3 cdrOutput.java
--- gnu/CORBA/CDR/cdrOutput.java	31 May 2005 20:27:14 -0000	1.3
+++ gnu/CORBA/CDR/cdrOutput.java	3 Jun 2005 14:28:22 -0000
@@ -706,7 +706,9 @@
       }
     catch (IOException ex)
       {
-        throw new MARSHAL("IOException while writing the data");
+        MARSHAL t = new MARSHAL();
+        t.initCause(ex);
+        throw t;
       }
   }
 
@@ -725,7 +727,9 @@
       }
     catch (IOException ex)
       {
-        throw new MARSHAL("IOException while writing the data");
+        MARSHAL t = new MARSHAL();
+        t.initCause(ex);
+        throw t;
       }
   }
 
Index: gnu/CORBA/CDR/encapsulatedOutput.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/CORBA/CDR/encapsulatedOutput.java,v
retrieving revision 1.2
diff -u -r1.2 encapsulatedOutput.java
--- gnu/CORBA/CDR/encapsulatedOutput.java	31 May 2005 20:27:14 -0000	1.2
+++ gnu/CORBA/CDR/encapsulatedOutput.java	3 Jun 2005 14:28:22 -0000
@@ -115,7 +115,9 @@
       }
     catch (IOException ex)
       {
-        throw new InternalError();
+        InternalError err = new InternalError();
+        err.initCause(ex);
+        throw err;
       }
   }
 
Index: gnu/CORBA/GIOP/ErrorMessage.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/CORBA/GIOP/ErrorMessage.java,v
retrieving revision 1.1
diff -u -r1.1 ErrorMessage.java
--- gnu/CORBA/GIOP/ErrorMessage.java	15 May 2005 01:09:29 -0000	1.1
+++ gnu/CORBA/GIOP/ErrorMessage.java	3 Jun 2005 14:18:46 -0000
@@ -89,7 +89,9 @@
       }
     catch (IOException ex)
       {
-        throw new MARSHAL(ex.toString());
+        MARSHAL t = new MARSHAL();
+        t.initCause(ex);
+        throw t;
       }
   }
 }
Index: gnu/CORBA/GIOP/MessageHeader.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/CORBA/GIOP/MessageHeader.java,v
retrieving revision 1.3
diff -u -r1.3 MessageHeader.java
--- gnu/CORBA/GIOP/MessageHeader.java	31 May 2005 20:27:14 -0000	1.3
+++ gnu/CORBA/GIOP/MessageHeader.java	3 Jun 2005 14:28:22 -0000
@@ -294,7 +294,9 @@
       }
     catch (IOException ex)
       {
-        throw new MARSHAL(ex.toString());
+        MARSHAL t = new MARSHAL();
+        t.initCause(ex);
+        throw t;
       }
   }
 
@@ -340,7 +342,9 @@
       }
     catch (IOException ex)
       {
-        throw new MARSHAL(ex.toString());
+        MARSHAL t = new MARSHAL();
+        t.initCause(ex);
+        throw t;
       }
   }
 }
\ No newline at end of file
Index: gnu/CORBA/GIOP/cxCodeSet.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/CORBA/GIOP/cxCodeSet.java,v
retrieving revision 1.1
diff -u -r1.1 cxCodeSet.java
--- gnu/CORBA/GIOP/cxCodeSet.java	15 May 2005 01:09:29 -0000	1.1
+++ gnu/CORBA/GIOP/cxCodeSet.java	3 Jun 2005 14:28:22 -0000
@@ -160,7 +160,9 @@
       }
     catch (IOException ex)
       {
-        throw new InternalError();
+        InternalError t = new InternalError();
+        t.initCause(ex);
+        throw t;
       }
   }
 
Index: gnu/CORBA/GIOP/v1_2/RequestHeader.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/CORBA/GIOP/v1_2/RequestHeader.java,v
retrieving revision 1.1
diff -u -r1.1 RequestHeader.java
--- gnu/CORBA/GIOP/v1_2/RequestHeader.java	15 May 2005 01:09:29 -0000	1.1
+++ gnu/CORBA/GIOP/v1_2/RequestHeader.java	3 Jun 2005 14:18:46 -0000
@@ -163,7 +163,9 @@
       }
     catch (IOException ex)
       {
-        throw new MARSHAL(ex.toString());
+        MARSHAL t = new MARSHAL();
+        t.initCause(ex);
+        throw t;
       }
   }
 
Index: org/omg/CosNaming/BindingIteratorHelper.java
===================================================================
RCS file: /cvsroot/classpath/classpath/org/omg/CosNaming/BindingIteratorHelper.java,v
retrieving revision 1.1
diff -u -r1.1 BindingIteratorHelper.java
--- org/omg/CosNaming/BindingIteratorHelper.java	15 May 2005 01:09:30 -0000	1.1
+++ org/omg/CosNaming/BindingIteratorHelper.java	3 Jun 2005 14:43:12 -0000
@@ -76,7 +76,9 @@
       }
     catch (ClassCastException ex)
       {
-        throw new BAD_OPERATION("Binding iterator expected");
+        BAD_OPERATION bad = new BAD_OPERATION("Binding iterator expected");
+        bad.initCause(ex);
+        throw bad;
       }
   }
 
Index: org/omg/CosNaming/BindingListHelper.java
===================================================================
RCS file: /cvsroot/classpath/classpath/org/omg/CosNaming/BindingListHelper.java,v
retrieving revision 1.1
diff -u -r1.1 BindingListHelper.java
--- org/omg/CosNaming/BindingListHelper.java	15 May 2005 01:09:30 -0000	1.1
+++ org/omg/CosNaming/BindingListHelper.java	3 Jun 2005 14:43:12 -0000
@@ -73,7 +73,9 @@
       }
     catch (ClassCastException ex)
       {
-        throw new BAD_OPERATION("Binding list expected");
+        BAD_OPERATION bad = new BAD_OPERATION("Binding list expected");
+        bad.initCause(ex);
+        throw bad;
       }
   }
 
Index: org/omg/CosNaming/BindingTypeHelper.java
===================================================================
RCS file: /cvsroot/classpath/classpath/org/omg/CosNaming/BindingTypeHelper.java,v
retrieving revision 1.1
diff -u -r1.1 BindingTypeHelper.java
--- org/omg/CosNaming/BindingTypeHelper.java	15 May 2005 01:09:30 -0000	1.1
+++ org/omg/CosNaming/BindingTypeHelper.java	3 Jun 2005 14:43:12 -0000
@@ -69,7 +69,9 @@
       }
     catch (ClassCastException ex)
       {
-        throw new BAD_OPERATION("Binding type expected");
+        BAD_OPERATION bad = new BAD_OPERATION("Binding type expected");
+        bad.initCause(ex);
+        throw bad;
       }
   }
 
Index: org/omg/CosNaming/NameComponentHelper.java
===================================================================
RCS file: /cvsroot/classpath/classpath/org/omg/CosNaming/NameComponentHelper.java,v
retrieving revision 1.1
diff -u -r1.1 NameComponentHelper.java
--- org/omg/CosNaming/NameComponentHelper.java	15 May 2005 01:09:30 -0000	1.1
+++ org/omg/CosNaming/NameComponentHelper.java	3 Jun 2005 14:43:12 -0000
@@ -74,7 +74,9 @@
       }
     catch (ClassCastException ex)
       {
-        throw new BAD_OPERATION("Name component expected");
+        BAD_OPERATION bad = new BAD_OPERATION("Name component expected");
+        bad.initCause(ex);
+        throw bad;
       }
   }
 
Index: org/omg/CosNaming/NameHelper.java
===================================================================
RCS file: /cvsroot/classpath/classpath/org/omg/CosNaming/NameHelper.java,v
retrieving revision 1.1
diff -u -r1.1 NameHelper.java
--- org/omg/CosNaming/NameHelper.java	15 May 2005 01:09:30 -0000	1.1
+++ org/omg/CosNaming/NameHelper.java	3 Jun 2005 14:43:12 -0000
@@ -75,7 +75,9 @@
       }
     catch (ClassCastException ex)
       {
-        throw new BAD_OPERATION("Name expected");
+        BAD_OPERATION bad = new BAD_OPERATION("Name expected");
+        bad.initCause(ex);
+        throw bad;
       }
   }
 
Index: org/omg/CosNaming/NamingContextExtHelper.java
===================================================================
RCS file: /cvsroot/classpath/classpath/org/omg/CosNaming/NamingContextExtHelper.java,v
retrieving revision 1.1
diff -u -r1.1 NamingContextExtHelper.java
--- org/omg/CosNaming/NamingContextExtHelper.java	15 May 2005 01:09:30 -0000	1.1
+++ org/omg/CosNaming/NamingContextExtHelper.java	3 Jun 2005 14:43:12 -0000
@@ -76,7 +76,9 @@
       }
     catch (ClassCastException ex)
       {
-        throw new BAD_OPERATION("NamingContextExt expected");
+        BAD_OPERATION bad = new BAD_OPERATION("NamingContextExt expected");
+        bad.initCause(ex);
+        throw bad;
       }
   }
 
Index: org/omg/CosNaming/NamingContextHelper.java
===================================================================
RCS file: /cvsroot/classpath/classpath/org/omg/CosNaming/NamingContextHelper.java,v
retrieving revision 1.1
diff -u -r1.1 NamingContextHelper.java
--- org/omg/CosNaming/NamingContextHelper.java	15 May 2005 01:09:30 -0000	1.1
+++ org/omg/CosNaming/NamingContextHelper.java	3 Jun 2005 14:43:12 -0000
@@ -76,7 +76,9 @@
       }
     catch (ClassCastException ex)
       {
-        throw new BAD_OPERATION("Naming context expected");
+        BAD_OPERATION bad = new BAD_OPERATION("Naming context expected");
+        bad.initCause(ex);
+        throw bad;
       }
   }
 
