Fix issues: 200 202 211 215 237 246.

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() {
   }