Other: Allow null values on optional long fields, see #590

protobufjs · Dec 29, 2016 · 3bab132 · 3bab132
1 parent 31da56c
commit 3bab132
Show file tree

Hide file tree

Showing 14 changed files with 17 additions and 17 deletions.
diff --git a/dist/noparse/protobuf.js b/dist/noparse/protobuf.js
diff --git a/dist/noparse/protobuf.js.map b/dist/noparse/protobuf.js.map
diff --git a/dist/noparse/protobuf.min.js b/dist/noparse/protobuf.min.js
diff --git a/dist/noparse/protobuf.min.js.gz b/dist/noparse/protobuf.min.js.gz
diff --git a/dist/noparse/protobuf.min.js.map b/dist/noparse/protobuf.min.js.map
diff --git a/dist/protobuf.js b/dist/protobuf.js
diff --git a/dist/protobuf.js.map b/dist/protobuf.js.map
diff --git a/dist/protobuf.min.js b/dist/protobuf.min.js
diff --git a/dist/protobuf.min.js.gz b/dist/protobuf.min.js.gz
diff --git a/dist/protobuf.min.js.map b/dist/protobuf.min.js.map
diff --git a/dist/runtime/protobuf.js b/dist/runtime/protobuf.js
diff --git a/dist/runtime/protobuf.min.js b/dist/runtime/protobuf.min.js
diff --git a/dist/runtime/protobuf.min.js.gz b/dist/runtime/protobuf.min.js.gz
diff --git a/src/encoder.js b/src/encoder.js
@@ -77,7 +77,7 @@ function encoder(mtype) {
 
                 if (field.long) {
                     gen
-    ("if(%s!==undefined&&util.longNe(%s,%d,%d))", ref, ref, field.defaultValue.low, field.defaultValue.high);
+    ("if(%s!==undefined&&%s!==null&&util.longNe(%s,%d,%d))", ref, ref, ref, field.defaultValue.low, field.defaultValue.high);
                 } else gen
     ("if(%s!==undefined&&%s!==%j)", ref, ref, field.defaultValue);