diff options
| author |  Jisi Liu <jisi.liu@gmail.com> | 2016-04-28 14:43:08 -0700 |
|---|---|---|
| committer | Jisi Liu <jisi.liu@gmail.com> | 2016-04-28 14:43:08 -0700 |
| commit | 12fdeb9b41cb5ce2a13a6f10f0626d6e67e9f237 (patch) | |
| tree | 82b9820ae26decd6ac41bd8a06185d978980ee3c /java/core/src | |
| parent | cf14183bcd5485b4a71541599ddce0b35eb71352 (diff) | |
| parent | b53417c7356deab70f44b60bd7e6270023ddc3b6 (diff) | |
Merge branch 'master' of github.com:google/protobuf
Diffstat (limited to 'java/core/src')
| -rw-r--r-- | java/core/src/main/java/com/google/protobuf/GeneratedMessage.java | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/java/core/src/main/java/com/google/protobuf/GeneratedMessage.java b/java/core/src/main/java/com/google/protobuf/GeneratedMessage.java index 57e732a0..790cb622 100644 --- a/java/core/src/main/java/com/google/protobuf/GeneratedMessage.java +++ b/java/core/src/main/java/com/google/protobuf/GeneratedMessage.java @@ -797,6 +797,8 @@ public abstract class GeneratedMessage extends AbstractMessage extends GeneratedMessage implements ExtendableMessageOrBuilder<MessageType> { + private static final long serialVersionUID = 1L; + private final FieldSet<FieldDescriptor> extensions; protected ExtendableMessage() { |