Fixed KNPE when inline functions/constants are completely removed.

2014-11-11 19:58:22 +03:00
parent c9e5099307
commit 1a374efcd1
8 changed files with 61 additions and 1 deletions
@@ -280,7 +280,12 @@ public class IncrementalCacheImpl(val baseDir: File): StorageOwner, IncrementalC
            if (oldMap == constantsMap) {
                return false
            }
-            map.put(key, constantsMap)
+            if (constantsMap != null) {
+                map.put(key, constantsMap)
+            }
+            else {
+                map.remove(key)
+            }
            return true
        }
    }
@@ -396,6 +401,9 @@ public class IncrementalCacheImpl(val baseDir: File): StorageOwner, IncrementalC
            if (inlineFunctionsMap != null) {
                map.put(key, inlineFunctionsMap)
            }
+            else {
+                map.remove(key)
+            }
            return true
        }
    }