1 files changed, 8 insertions, 19 deletions

diff --git a/libjava/classpath/gnu/CORBA/GIOP/ReplyHeader.java b/libjava/classpath/gnu/CORBA/GIOP/ReplyHeader.java
index 1e0e154f80d..f0f409394e6 100644
--- a/libjava/classpath/gnu/CORBA/GIOP/ReplyHeader.java
+++ b/libjava/classpath/gnu/CORBA/GIOP/ReplyHeader.java
@@ -41,13 +41,13 @@ package gnu.CORBA.GIOP;
 import gnu.CORBA.CDR.cdrInput;
 import gnu.CORBA.CDR.cdrOutput;
 
-
 /**
  * The header of the standard reply.
  *
  * @author Audrius Meskauskas (AudriusA@Bioinformatics.org)
  */
 public abstract class ReplyHeader
+  extends contextSupportingHeader
 {
   /**
    * Reply status, if no exception occured.
@@ -65,9 +65,8 @@ public abstract class ReplyHeader
   public static final int SYSTEM_EXCEPTION = 2;
 
   /**
-   * Reply status, if the client ORB must re - send
-   * the request to another destination. The body
-   * contains IOR.
+   * Reply status, if the client ORB must re - send the request to another
+   * destination. The body contains IOR.
    */
   public static final int LOCATION_FORWARD = 3;
 
@@ -84,16 +83,6 @@ public abstract class ReplyHeader
   public static final int NEEDS_ADDRESSING_MODE = 5;
 
   /**
-   * Empty array, indicating that no service context is available.
-   */
-  protected static final ServiceContext[] NO_CONTEXT = new ServiceContext[ 0 ];
-
-  /**
-   * The ORB service data.
-   */
-  public ServiceContext[] service_context = NO_CONTEXT;
-
-  /**
    * The status of this reply, holds one of the reply status constants.
    */
   public int reply_status;
@@ -110,19 +99,19 @@ public abstract class ReplyHeader
   {
     switch (reply_status)
       {
-        case NO_EXCEPTION :
+        case NO_EXCEPTION:
           return "ok";
 
-        case USER_EXCEPTION :
+        case USER_EXCEPTION:
           return "user exception";
 
-        case SYSTEM_EXCEPTION :
+        case SYSTEM_EXCEPTION:
           return "system exception";
 
-        case LOCATION_FORWARD :
+        case LOCATION_FORWARD:
           return "moved";
 
-        default :
+        default:
           return null;
       }
   }