From 2f5c7ee22a0c6271fc1bf5ea31e4b4149431625c Mon Sep 17 00:00:00 2001
From: B Nguyen <bn-dignitas@users.noreply.github.com>
Date: Sun, 9 Jul 2017 20:03:55 -0400
Subject: [PATCH] Remove originatingID and receivingID fields since they are
 handled in the superclass and the extra writes were incorrect and reads on
 unmarshall were causing an EOFException

---
 .../edu/nps/moves/dis7/StartResumePdu.java    | 34 -------------------
 1 file changed, 34 deletions(-)

diff --git a/src/main/java/edu/nps/moves/dis7/StartResumePdu.java b/src/main/java/edu/nps/moves/dis7/StartResumePdu.java
index b7f103ab..df19707f 100644
--- a/src/main/java/edu/nps/moves/dis7/StartResumePdu.java
+++ b/src/main/java/edu/nps/moves/dis7/StartResumePdu.java
@@ -16,11 +16,6 @@
  */
 public class StartResumePdu extends SimulationManagementFamilyPdu implements Serializable
 {
-   /** Identifier for originating entity(or simulation) */
-   protected EntityID  originatingID = new EntityID(); 
-
-   /** Identifier for the receiving entity(or simulation) */
-   protected EntityID  receivingID = new EntityID(); 
 
    /** This field shall specify the real-world time (UTC) at which the entity is to start/resume in the exercise. This information shall be used by the participating simulation applications to start/resume an exercise synchronously. This field shall be represented by a Clock Time record (see 6.2.16). */
    protected ClockTime  realWorldTime = new ClockTime(); 
@@ -43,8 +38,6 @@ public int getMarshalledSize()
    int marshalSize = 0; 
 
    marshalSize = super.getMarshalledSize();
-   marshalSize = marshalSize + originatingID.getMarshalledSize();  // originatingID
-   marshalSize = marshalSize + receivingID.getMarshalledSize();  // receivingID
    marshalSize = marshalSize + realWorldTime.getMarshalledSize();  // realWorldTime
    marshalSize = marshalSize + simulationTime.getMarshalledSize();  // simulationTime
    marshalSize = marshalSize + 4;  // requestID
@@ -52,23 +45,6 @@ public int getMarshalledSize()
    return marshalSize;
 }
 
-
-public void setOriginatingID(EntityID pOriginatingID)
-{ originatingID = pOriginatingID;
-}
-
-public EntityID getOriginatingID()
-{ return originatingID; 
-}
-
-public void setReceivingID(EntityID pReceivingID)
-{ receivingID = pReceivingID;
-}
-
-public EntityID getReceivingID()
-{ return receivingID; 
-}
-
 public void setRealWorldTime(ClockTime pRealWorldTime)
 { realWorldTime = pRealWorldTime;
 }
@@ -99,8 +75,6 @@ public void marshal(DataOutputStream dos)
     super.marshal(dos);
     try 
     {
-       originatingID.marshal(dos);
-       receivingID.marshal(dos);
        realWorldTime.marshal(dos);
        simulationTime.marshal(dos);
        dos.writeInt( (int)requestID);
@@ -116,8 +90,6 @@ public void unmarshal(DataInputStream dis)
 
     try 
     {
-       originatingID.unmarshal(dis);
-       receivingID.unmarshal(dis);
        realWorldTime.unmarshal(dis);
        simulationTime.unmarshal(dis);
        requestID = dis.readInt();
@@ -140,8 +112,6 @@ public void unmarshal(DataInputStream dis)
 public void marshal(java.nio.ByteBuffer buff)
 {
        super.marshal(buff);
-       originatingID.marshal(buff);
-       receivingID.marshal(buff);
        realWorldTime.marshal(buff);
        simulationTime.marshal(buff);
        buff.putInt( (int)requestID);
@@ -158,8 +128,6 @@ public void unmarshal(java.nio.ByteBuffer buff)
 {
        super.unmarshal(buff);
 
-       originatingID.unmarshal(buff);
-       receivingID.unmarshal(buff);
        realWorldTime.unmarshal(buff);
        simulationTime.unmarshal(buff);
        requestID = buff.getInt();
@@ -197,8 +165,6 @@ public boolean equalsImpl(Object obj)
 
      final StartResumePdu rhs = (StartResumePdu)obj;
 
-     if( ! (originatingID.equals( rhs.originatingID) )) ivarsEqual = false;
-     if( ! (receivingID.equals( rhs.receivingID) )) ivarsEqual = false;
      if( ! (realWorldTime.equals( rhs.realWorldTime) )) ivarsEqual = false;
      if( ! (simulationTime.equals( rhs.simulationTime) )) ivarsEqual = false;
      if( ! (requestID == rhs.requestID)) ivarsEqual = false;