commit ef3dda7f378e3f5f116233d4072805c8126da39e
author Shawn O. Pearce <sop@google.com> Mon Nov 15 11:27:38 2010 -0800
committer Shawn O. Pearce <sop@google.com> Mon Nov 15 11:29:22 2010 -0800
tree 392df52bddd4222a709b90aa06ab78cae5771f40
parent 8dc6ca89e881048fc72d80ee214beab46a123675

Fix NPE when loading IntraLineDiff from disk cache

We failed to populate the list member, which resulted in the
IntraLineDiff crashing with NPE when it was loaded from the disk
cache after a graceful server restart.

Change-Id: Iff5a49d8de26df6c89cb56e1086d35838e71e5b4
Signed-off-by: Shawn O. Pearce <sop@google.com>

gerrit-server/src/main/java/com/google/gerrit/server/patch/IntraLineDiff.java

diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/patch/IntraLineDiff.java b/gerrit-server/src/main/java/com/google/gerrit/server/patch/IntraLineDiff.java
index f8f339e..d694724 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/patch/IntraLineDiff.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/patch/IntraLineDiff.java
@@ -33,10 +33,10 @@
 public class IntraLineDiff implements Serializable {
   static final long serialVersionUID = IntraLineDiffKey.serialVersionUID;
 
-  private List<Edit> edits;
+  private transient List<Edit> edits;
 
   IntraLineDiff(List<Edit> edits) {
-    this.edits = edits;
+    this.edits = Collections.unmodifiableList(edits);
   }
 
   public List<Edit> getEdits() {
@@ -69,11 +69,13 @@
       int innerCount = readVarInt32(in);
       if (0 < innerCount) {
         Edit[] inner = new Edit[innerCount];
-        for (int j = 0; j < innerCount; j++)
+        for (int j = 0; j < innerCount; j++) {
           inner[j] = readEdit(in);
+        }
         editArray[i] = new ReplaceEdit(editArray[i], toList(inner));
       }
     }
+    edits = toList(editArray);
   }
 
   private static void writeEdit(OutputStream out, Edit e) throws IOException {

gerrit-server/src/main/java/com/google/gerrit/server/patch/IntraLineDiffKey.java

diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/patch/IntraLineDiffKey.java b/gerrit-server/src/main/java/com/google/gerrit/server/patch/IntraLineDiffKey.java
index 899dda5..61004dd 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/patch/IntraLineDiffKey.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/patch/IntraLineDiffKey.java
@@ -27,7 +27,7 @@
 import java.util.List;
 
 public class IntraLineDiffKey implements Serializable {
-  static final long serialVersionUID = 1L;
+  static final long serialVersionUID = 2L;
 
   private transient ObjectId aId;
   private transient ObjectId bId;