fix tests broken by previous changes
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/a50776c3 Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/a50776c3 Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/a50776c3 Branch: refs/heads/develop Commit: a50776c331b835d1c3974cc9ec6ce184cca9cdd2 Parents: bd64874 Author: Alex Harui <aha...@apache.org> Authored: Mon Jun 24 23:58:17 2013 -0700 Committer: Alex Harui <aha...@apache.org> Committed: Mon Jun 24 23:58:17 2013 -0700 ---------------------------------------------------------------------- .../compiler/internal/codegen/mxml/flexjs/MXMLFlexJSEmitter.java | 2 ++ .../compiler/internal/codegen/databinding/BindingDatabase.java | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/a50776c3/compiler.jx/src/org/apache/flex/compiler/internal/codegen/mxml/flexjs/MXMLFlexJSEmitter.java ---------------------------------------------------------------------- diff --git a/compiler.jx/src/org/apache/flex/compiler/internal/codegen/mxml/flexjs/MXMLFlexJSEmitter.java b/compiler.jx/src/org/apache/flex/compiler/internal/codegen/mxml/flexjs/MXMLFlexJSEmitter.java index 09fe26a..eb94f27 100644 --- a/compiler.jx/src/org/apache/flex/compiler/internal/codegen/mxml/flexjs/MXMLFlexJSEmitter.java +++ b/compiler.jx/src/org/apache/flex/compiler/internal/codegen/mxml/flexjs/MXMLFlexJSEmitter.java @@ -236,6 +236,8 @@ public class MXMLFlexJSEmitter extends MXMLEmitter implements protected void emitBindingData(String cname, IClassDefinition cdef) { BindingDatabase bd = BindingDatabase.bindingMap.get(cdef); + if (bd == null) + return; if (bd.getBindingInfo().isEmpty()) return; http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/a50776c3/compiler/src/org/apache/flex/compiler/internal/codegen/databinding/BindingDatabase.java ---------------------------------------------------------------------- diff --git a/compiler/src/org/apache/flex/compiler/internal/codegen/databinding/BindingDatabase.java b/compiler/src/org/apache/flex/compiler/internal/codegen/databinding/BindingDatabase.java index f55aba1..ff66319 100644 --- a/compiler/src/org/apache/flex/compiler/internal/codegen/databinding/BindingDatabase.java +++ b/compiler/src/org/apache/flex/compiler/internal/codegen/databinding/BindingDatabase.java @@ -21,13 +21,13 @@ package org.apache.flex.compiler.internal.codegen.databinding; import java.util.ArrayList; import java.util.Collection; -import java.util.HashMap; import java.util.LinkedHashMap; import java.util.List; import java.util.Map; import java.util.Map.Entry; import java.util.Set; import java.util.TreeSet; +import java.util.WeakHashMap; import org.apache.flex.compiler.definitions.IClassDefinition; import org.apache.flex.compiler.internal.as.codegen.MXMLClassDirectiveProcessor; @@ -91,7 +91,7 @@ public class BindingDatabase private static List<BindingDatabase> _diagnosticLogger; - public static Map<IClassDefinition, BindingDatabase> bindingMap = new HashMap<IClassDefinition, BindingDatabase>(); + public static WeakHashMap<IClassDefinition, BindingDatabase> bindingMap = new WeakHashMap<IClassDefinition, BindingDatabase>(); /** * test only field. Total number of watcher info's of all types