addressed code review comments.

Author: Inderjeet Singh

gson/src/main/java/com/google/gson/Gson.java

@@ -134,7 +134,7 @@ public final class Gson {
   private final boolean generateNonExecutableJson;
   private final boolean prettyPrinting;
   private final boolean lenient;
-  private JsonAdapterAnnotationTypeAdapterFactory jsonAdapterFactory;
+  private final JsonAdapterAnnotationTypeAdapterFactory jsonAdapterFactory;
 
   /**
    * Constructs a Gson object with default configuration. The default configuration has the
@@ -488,14 +488,13 @@ public <T> TypeAdapter<T> getAdapter(TypeToken<T> type) {
    * @since 2.2
    */
   public <T> TypeAdapter<T> getDelegateAdapter(TypeAdapterFactory skipPast, TypeToken<T> type) {
-    boolean skipPastFound = false;
-
     // Hack. If the skipPast factory isn't registered, assume the factory is being requested via
     // our @JsonAdapter annotation.
     if (!factories.contains(skipPast)) {
       skipPast = jsonAdapterFactory;
     }
 
+    boolean skipPastFound = false;
     for (TypeAdapterFactory factory : factories) {
       if (!skipPastFound) {
         if (factory == skipPast) {

gson/src/test/java/com/google/gson/functional/JsonAdapterAnnotationOnFieldsTest.java

@@ -274,20 +274,20 @@ private static final class LongToStringTypeAdapterFactory implements TypeAdapter
   }
 
   public void testFieldAnnotationWorksForParameterizedType() {
-      Gson gson = new Gson();
-      String json = gson.toJson(new Gizmo2(Arrays.asList(new Part("Part"))));
-      assertEquals("{\"part\":\"GizmoPartTypeAdapterFactory\"}", json);
-      Gizmo2 computer = gson.fromJson("{'part':'Part'}", Gizmo2.class);
-      assertEquals("GizmoPartTypeAdapterFactory", computer.part.get(0).name);
-    }
+    Gson gson = new Gson();
+    String json = gson.toJson(new Gizmo2(Arrays.asList(new Part("Part"))));
+    assertEquals("{\"part\":\"GizmoPartTypeAdapterFactory\"}", json);
+    Gizmo2 computer = gson.fromJson("{'part':'Part'}", Gizmo2.class);
+    assertEquals("GizmoPartTypeAdapterFactory", computer.part.get(0).name);
+  }
 
   private static final class Gizmo2 {
-      @JsonAdapter(Gizmo2PartTypeAdapterFactory.class)
-      List<Part> part;
-      Gizmo2(List<Part> part) {
-        this.part = part;
-      }
+    @JsonAdapter(Gizmo2PartTypeAdapterFactory.class)
+    List<Part> part;
+    Gizmo2(List<Part> part) {
+      this.part = part;
     }
+  }
 
   private static class Gizmo2PartTypeAdapterFactory implements TypeAdapterFactory {
     @Override public <T> TypeAdapter<T> create(Gson gson, final TypeToken<T> type) {