From 9a2ec820dc0824c08ee9f0d41c778260bce2380c Mon Sep 17 00:00:00 2001
From: Mani Sarkar <sadhak001@gmail.com>
Date: Mon, 2 Jul 2012 14:11:44 -0700
Subject: [PATCH] 7176907: additional warnings cleanup in java.util,
 java.util.regexp, java.util.zip

Reviewed-by: forax, khazra, smarks
---
 .../classes/java/util/InvalidPropertiesFormatException.java   | 3 +++
 jdk/src/share/classes/java/util/regex/Pattern.java            | 4 ++++
 jdk/src/share/classes/java/util/zip/GZIPInputStream.java      | 2 +-
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/jdk/src/share/classes/java/util/InvalidPropertiesFormatException.java b/jdk/src/share/classes/java/util/InvalidPropertiesFormatException.java
index 64dde4d42a4..2d92ae66e85 100644
--- a/jdk/src/share/classes/java/util/InvalidPropertiesFormatException.java
+++ b/jdk/src/share/classes/java/util/InvalidPropertiesFormatException.java
@@ -44,6 +44,9 @@ import java.io.IOException;
  */
 
 public class InvalidPropertiesFormatException extends IOException {
+
+    private static final long serialVersionUID = 7763056076009360219L;
+
     /**
      * Constructs an InvalidPropertiesFormatException with the specified
      * cause.
diff --git a/jdk/src/share/classes/java/util/regex/Pattern.java b/jdk/src/share/classes/java/util/regex/Pattern.java
index 6c32f6a30bb..1c3d9fe0752 100644
--- a/jdk/src/share/classes/java/util/regex/Pattern.java
+++ b/jdk/src/share/classes/java/util/regex/Pattern.java
@@ -2026,6 +2026,7 @@ loop:   for(int x=0, offset=0; x<nCodePoints; x++, offset+=len) {
         }
     }
 
+    @SuppressWarnings("fallthrough")
     /**
      * Parsing of sequences between alternations.
      */
@@ -2140,6 +2141,7 @@ loop:   for(int x=0, offset=0; x<nCodePoints; x++, offset+=len) {
         return head;
     }
 
+    @SuppressWarnings("fallthrough")
     /**
      * Parse and add a new Single or Slice.
      */
@@ -2978,6 +2980,7 @@ loop:   for(int x=0, offset=0; x<nCodePoints; x++, offset+=len) {
         return head;
     }
 
+    @SuppressWarnings("fallthrough")
     /**
      * Parses inlined match flags and set them appropriately.
      */
@@ -3019,6 +3022,7 @@ loop:   for(int x=0, offset=0; x<nCodePoints; x++, offset+=len) {
         }
     }
 
+    @SuppressWarnings("fallthrough")
     /**
      * Parses the second part of inlined match flags and turns off
      * flags appropriately.
diff --git a/jdk/src/share/classes/java/util/zip/GZIPInputStream.java b/jdk/src/share/classes/java/util/zip/GZIPInputStream.java
index 8d60d19969b..4c4cc537b0e 100644
--- a/jdk/src/share/classes/java/util/zip/GZIPInputStream.java
+++ b/jdk/src/share/classes/java/util/zip/GZIPInputStream.java
@@ -252,7 +252,7 @@ class GZIPInputStream extends InflaterInputStream {
      */
     private int readUShort(InputStream in) throws IOException {
         int b = readUByte(in);
-        return ((int)readUByte(in) << 8) | b;
+        return (readUByte(in) << 8) | b;
     }
 
     /*