aboutsummaryrefslogtreecommitdiff
path: root/java/src/main/java/com/google/protobuf/Internal.java
diff options
context:
space:
mode:
authorFeng Xiao <xfxyjwf@gmail.com>2014-11-20 16:18:53 -0800
committerFeng Xiao <xfxyjwf@gmail.com>2014-11-20 16:18:53 -0800
commit99aa0f9e8f1a88def7bdebf1385678559cda0707 (patch)
tree7ccb663ee9a1c722bf6062435ac705e83568c7e8 /java/src/main/java/com/google/protobuf/Internal.java
parent49bc8c09636ae61f9c685d121278c3738b9a809a (diff)
downloadprotobuf-99aa0f9e8f1a88def7bdebf1385678559cda0707.tar.gz
protobuf-99aa0f9e8f1a88def7bdebf1385678559cda0707.tar.bz2
protobuf-99aa0f9e8f1a88def7bdebf1385678559cda0707.zip
Down-integrate from internal code base.
Diffstat (limited to 'java/src/main/java/com/google/protobuf/Internal.java')
-rw-r--r--java/src/main/java/com/google/protobuf/Internal.java4
1 files changed, 4 insertions, 0 deletions
diff --git a/java/src/main/java/com/google/protobuf/Internal.java b/java/src/main/java/com/google/protobuf/Internal.java
index ba0f526b..5ef39418 100644
--- a/java/src/main/java/com/google/protobuf/Internal.java
+++ b/java/src/main/java/com/google/protobuf/Internal.java
@@ -393,6 +393,10 @@ public class Internal {
*/
public static final ByteBuffer EMPTY_BYTE_BUFFER =
ByteBuffer.wrap(EMPTY_BYTE_ARRAY);
+
+ /** An empty coded input stream constant used in generated code. */
+ public static final CodedInputStream EMPTY_CODED_INPUT_STREAM =
+ CodedInputStream.newInstance(EMPTY_BYTE_ARRAY);
/**