commit e0c02f59ec60db23b2d2809d02e6e17817d99879
author Alexander Afanasyev <alexander.afanasyev@ucla.edu> Sat Dec 28 20:44:25 2013 -0800
committer Alexander Afanasyev <alexander.afanasyev@ucla.edu> Thu Jan 09 15:14:11 2014 -0800
tree 8d4f4bf679f65cd314a1a6c25d15f3b7cd07032e
parent 1837187da2faead73d62665b618aa7e81291dee5

node+face-management-protocol: Finalizing prefix registration (selfreg)

Change-Id: I88aa15b785824a53fcc167b57fb1f0831b5aa9fa

include/ndn-cpp/data.hpp

diff --git a/include/ndn-cpp/data.hpp b/include/ndn-cpp/data.hpp
index cd6176f..8f97c87 100644
--- a/include/ndn-cpp/data.hpp
+++ b/include/ndn-cpp/data.hpp
@@ -236,10 +236,14 @@
   
 inline void
 Data::setContent(const Block& content) 
-{ 
+{
   onChanged();
 
-  content_ = content;
+  if (content.type() == Tlv::Content)
+    content_ = content;
+  else {
+    content_ = Block(Tlv::Content, content);
+  }
 }
 
 inline const Signature&