commit f7153dbdac65cc057f13cda280423980e476e6da
author andrewsbrown <andrew.brown@intel.com> Fri May 15 10:25:55 2015 -0700
committer andrewsbrown <andrew.brown@intel.com> Fri May 15 10:25:55 2015 -0700
tree 40c8784b2f338ec3461985f266def5c957b4f05e
parent 3bb3a21e4ea851fddfad4e428fedbec6659f9a13

Fix bug: ControlParameters' name now can be null

src/main/java/com/intel/jndn/management/EncodingHelper.java

diff --git a/src/main/java/com/intel/jndn/management/EncodingHelper.java b/src/main/java/com/intel/jndn/management/EncodingHelper.java
index 49a775f..b24241d 100644
--- a/src/main/java/com/intel/jndn/management/EncodingHelper.java
+++ b/src/main/java/com/intel/jndn/management/EncodingHelper.java
@@ -190,7 +190,7 @@
     encoder.writeOptionalNonNegativeIntegerTlv(Tlv.ControlParameters_FaceId, controlParameters.getFaceId());
 
     // Encode name
-    if (controlParameters.getName().size() != 0) {
+    if (controlParameters.getName() != null && controlParameters.getName().size() != 0) {
       encodeName(controlParameters.getName(), encoder);
     }