commit f494f3ed4995adbf41b2678d60606080ceafb441
author Janak Ramakrishnan <janakr@google.com> Mon Sep 14 21:29:56 2015 +0000
committer John Field <jfield@google.com> Tue Sep 15 20:26:13 2015 +0000
tree 77a805f5c032785c7965ffc589be37faea5d5b80
parent 6a22219663e7f08603e17d003438e51cf0d306df

Hack serialization of Environment$Extension so that it deserializes, although not correctly. Attempts to use it will still most likely fail, but won't crash.

--
MOS_MIGRATED_REVID=103029603

src/main/java/com/google/devtools/build/lib/syntax/Environment.java

diff --git a/src/main/java/com/google/devtools/build/lib/syntax/Environment.java b/src/main/java/com/google/devtools/build/lib/syntax/Environment.java
index 1bfba3a..89360a7 100644
--- a/src/main/java/com/google/devtools/build/lib/syntax/Environment.java
+++ b/src/main/java/com/google/devtools/build/lib/syntax/Environment.java
@@ -230,6 +230,11 @@
     BaseExtension(Environment env) {
       this.bindings = ImmutableMap.copyOf(env.globalFrame.bindings);
     }
+
+    // Hack to allow serialization.
+    BaseExtension() {
+      this.bindings = ImmutableMap.of();
+    }
   }
 
   /**
@@ -249,6 +254,12 @@
       this.transitiveContentHashCode = env.getTransitiveContentHashCode();
     }
 
+    // Hack to allow serialization.
+    private Extension() {
+      super();
+      this.transitiveContentHashCode = null;
+    }
+
     @VisibleForTesting // This is only used in one test.
     public String getTransitiveContentHashCode() {
       return transitiveContentHashCode;