From 9d2bf09460689ab5a494cb419ede357c34f313a2 Mon Sep 17 00:00:00 2001
From: "Peter D. Barnes, Jr." <barnes26@llnl.gov>
Date: Mon, 1 Jul 2013 10:06:39 -0700
Subject: [PATCH] Backout changeset 581c9b2f52c842a06cd3692c1a043a64b85c0c36

---
 src/network/model/nix-vector.cc      | 3 +--
 src/network/model/packet-metadata.cc | 4 +---
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/network/model/nix-vector.cc b/src/network/model/nix-vector.cc
index 982cdbbfd..546a8642e 100644
--- a/src/network/model/nix-vector.cc
+++ b/src/network/model/nix-vector.cc
@@ -311,8 +311,7 @@ NixVector::Deserialize (const uint32_t* buffer, uint32_t size)
 
   // return zero if an entire nix-vector was 
   // not deserialized
-  // This check is obviated by prior assert
-  return 1;
+  return (sizeCheck != 0) ? 0 : 1;
 }
 
 void
diff --git a/src/network/model/packet-metadata.cc b/src/network/model/packet-metadata.cc
index a54dc93fa..51f73fb92 100644
--- a/src/network/model/packet-metadata.cc
+++ b/src/network/model/packet-metadata.cc
@@ -1349,9 +1349,7 @@ PacketMetadata::Deserialize (const uint8_t* buffer, uint32_t size)
       UpdateTail (tmp);
     }
   NS_ASSERT (desSize == 0);
-  // Return zero if entire meta data was not deserialized
-  // This check is obviated by prior assert
-  return 1;
+  return (desSize !=0) ? 0 : 1;
 }
 
 uint8_t*