diff options
| author | Chris Fallin <cfallin@c1f.net> | 2015-02-19 12:14:57 -0800 |
|---|---|---|
| committer | Chris Fallin <cfallin@c1f.net> | 2015-02-19 12:14:57 -0800 |
| commit | 709164e764fcf0e4be79e721dafeda4544f27b40 (patch) | |
| tree | d478333c09c0de8806515ee38163474aa76d6170 | |
| parent | b262575bf2d80fe13b06ac2b53a06e3e11c9e34c (diff) | |
| parent | fbfdbe8ad8a4acd9fea54cfc4716ea82753b8f60 (diff) | |
| download | protobuf-709164e764fcf0e4be79e721dafeda4544f27b40.tar.gz protobuf-709164e764fcf0e4be79e721dafeda4544f27b40.tar.bz2 protobuf-709164e764fcf0e4be79e721dafeda4544f27b40.zip | |
Merge pull request #213 from pherl/maps
Use EMPTY_BYTES in WireFormatNano
| -rw-r--r-- | javanano/src/main/java/com/google/protobuf/nano/InternalNano.java | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/javanano/src/main/java/com/google/protobuf/nano/InternalNano.java b/javanano/src/main/java/com/google/protobuf/nano/InternalNano.java index c92ec417..4a08bb58 100644 --- a/javanano/src/main/java/com/google/protobuf/nano/InternalNano.java +++ b/javanano/src/main/java/com/google/protobuf/nano/InternalNano.java @@ -354,13 +354,12 @@ public final class InternalNano { } return result; } - private static final byte[] EMPTY_BYTES = new byte[0]; private static Object primitiveDefaultValue(int type) { switch (type) { case TYPE_BOOL: return Boolean.FALSE; case TYPE_BYTES: - return EMPTY_BYTES; + return WireFormatNano.EMPTY_BYTES; case TYPE_STRING: return ""; case TYPE_FLOAT: |