diff options
author | liujisi@google.com <liujisi@google.com@630680e5-0e50-0410-840e-4b1c322b438d> | 2010-12-06 06:20:14 +0000 |
---|---|---|
committer | liujisi@google.com <liujisi@google.com@630680e5-0e50-0410-840e-4b1c322b438d> | 2010-12-06 06:20:14 +0000 |
commit | 5d8d2b054224bc5fdc73b886f8e765c360f86734 (patch) | |
tree | 650fa406aa2dbacbfb4ff5b640411cb5643d0218 /java | |
parent | 2726e7a6ebd72eec6f66abe4ced3c88983f20b8e (diff) | |
download | protobuf-5d8d2b054224bc5fdc73b886f8e765c360f86734.tar.gz protobuf-5d8d2b054224bc5fdc73b886f8e765c360f86734.tar.bz2 protobuf-5d8d2b054224bc5fdc73b886f8e765c360f86734.zip |
Fix issues: 200 202 211 215 237 246.
Diffstat (limited to 'java')
3 files changed, 3 insertions, 1 deletions
diff --git a/java/src/main/java/com/google/protobuf/CodedOutputStream.java b/java/src/main/java/com/google/protobuf/CodedOutputStream.java index 51a932a3..f3582e2d 100644 --- a/java/src/main/java/com/google/protobuf/CodedOutputStream.java +++ b/java/src/main/java/com/google/protobuf/CodedOutputStream.java @@ -396,7 +396,7 @@ public final class CodedOutputStream { * for converting the enum value to its numeric value. */ public void writeEnumNoTag(final int value) throws IOException { - writeRawVarint32(value); + writeInt32NoTag(value); } /** Write an {@code sfixed32} field to the stream. */ diff --git a/java/src/main/java/com/google/protobuf/GeneratedMessage.java b/java/src/main/java/com/google/protobuf/GeneratedMessage.java index fc2e5303..2c22fcab 100644 --- a/java/src/main/java/com/google/protobuf/GeneratedMessage.java +++ b/java/src/main/java/com/google/protobuf/GeneratedMessage.java @@ -56,6 +56,7 @@ import java.util.TreeMap; */ public abstract class GeneratedMessage extends AbstractMessage implements Serializable { + private static final long serialVersionUID = 1L; private final UnknownFieldSet unknownFields; diff --git a/java/src/main/java/com/google/protobuf/GeneratedMessageLite.java b/java/src/main/java/com/google/protobuf/GeneratedMessageLite.java index 30a75715..1813e9b3 100644 --- a/java/src/main/java/com/google/protobuf/GeneratedMessageLite.java +++ b/java/src/main/java/com/google/protobuf/GeneratedMessageLite.java @@ -47,6 +47,7 @@ import java.util.Map; */ public abstract class GeneratedMessageLite extends AbstractMessageLite implements Serializable { + private static final long serialVersionUID = 1L; protected GeneratedMessageLite() { } |