Properly implement clone to return the actual object in a hierarchy

ibauersachs · ibauersachs · commit 57b9f26e5c88 · 2019-10-27T20:03:31.000+01:00
diff --git a/src/main/java/org/xbill/DNS/DNSSEC.java b/src/main/java/org/xbill/DNS/DNSSEC.java
@@ -1201,7 +1201,7 @@ static void verifyMessage(
       out.writeByteArray(previous.getSignature());
     }
 
-    Header header = (Header) message.getHeader().clone();
+    Header header = message.getHeader().clone();
     header.decCount(Section.ADDITIONAL);
     out.writeByteArray(header.toWire());
 
diff --git a/src/main/java/org/xbill/DNS/Header.java b/src/main/java/org/xbill/DNS/Header.java
@@ -274,8 +274,13 @@ public String toString() {
 
   /* Creates a new Header identical to the current one */
   @Override
-  public Object clone() {
-    Header h = new Header();
+  public Header clone() {
+    Header h;
+    try {
+      h = (Header) super.clone();
+    } catch (CloneNotSupportedException e) {
+      throw new RuntimeException(e);
+    }
     h.id = id;
     h.flags = flags;
     System.arraycopy(counts, 0, h.counts, 0, counts.length);
diff --git a/src/main/java/org/xbill/DNS/Message.java b/src/main/java/org/xbill/DNS/Message.java
@@ -620,14 +620,19 @@ public String toString() {
    * @see OPTRecord
    */
   @Override
-  public Object clone() {
-    Message m = new Message();
+  public Message clone() {
+    Message m;
+    try {
+      m = (Message) super.clone();
+    } catch (CloneNotSupportedException e) {
+      throw new RuntimeException(e);
+    }
     for (int i = 0; i < sections.length; i++) {
       if (sections[i] != null) {
         m.sections[i] = new LinkedList<>(sections[i]);
       }
     }
-    m.header = (Header) header.clone();
+    m.header = header.clone();
     m.size = size;
     return m;
   }
diff --git a/src/main/java/org/xbill/DNS/SimpleResolver.java b/src/main/java/org/xbill/DNS/SimpleResolver.java
@@ -230,7 +230,7 @@ public Message send(Message query) throws IOException {
       }
     }
 
-    query = (Message) query.clone();
+    query = query.clone();
     applyEDNS(query);
     if (tsig != null) {
       tsig.apply(query, null);
diff --git a/src/test/java/org/xbill/DNS/HeaderTest.java b/src/test/java/org/xbill/DNS/HeaderTest.java
@@ -362,7 +362,7 @@ void test_clone() {
     m_h.setCount(1, 0xFF);
     m_h.setCount(2, 0x0A);
 
-    Header h2 = (Header) m_h.clone();
+    Header h2 = m_h.clone();
 
     assertNotSame(m_h, h2);
     assertEquals(m_h.getID(), h2.getID());

Original file line number	Diff line number	Diff line change
`@@ -1201,7 +1201,7 @@ static void verifyMessage(`
`1201`	`1201`	`out.writeByteArray(previous.getSignature());`
`1202`	`1202`	`}`
`1203`	`1203`
`1204`		`- Header header = (Header) message.getHeader().clone();`
	`1204`	`+ Header header = message.getHeader().clone();`
`1205`	`1205`	`header.decCount(Section.ADDITIONAL);`
`1206`	`1206`	`out.writeByteArray(header.toWire());`
`1207`	`1207`
Original file line number	Diff line number	Diff line change
`@@ -230,7 +230,7 @@ public Message send(Message query) throws IOException {`
`230`	`230`	`}`
`231`	`231`	`}`
`232`	`232`
`233`		`- query = (Message) query.clone();`
	`233`	`+ query = query.clone();`
`234`	`234`	`applyEDNS(query);`
`235`	`235`	`if (tsig != null) {`
`236`	`236`	`tsig.apply(query, null);`