commit 7bb5b5d147b8ec75a48304f906324da754f5d06f
author Goktug Gokdogan <goktug@google.com> Fri May 15 12:49:54 2015 -0700
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri May 15 22:42:20 2015 +0000
tree e994e9148d1a073eb741b36686fad827a7bdfc74
parent aaf1184a6df6e877d7888e3f4e0fb3e0dc37caef

Fixes broken closure code path in 5cc145f2133297362a1f8628aa6ebd72fe319306

Change-Id: I5a12573041ffe402766ac39f0cbc828b782222c3

dev/core/super/com/google/gwt/dev/jjs/intrinsic/com/google/gwt/lang/JavaClassHierarchySetupUtil.java

diff --git a/dev/core/super/com/google/gwt/dev/jjs/intrinsic/com/google/gwt/lang/JavaClassHierarchySetupUtil.java b/dev/core/super/com/google/gwt/dev/jjs/intrinsic/com/google/gwt/lang/JavaClassHierarchySetupUtil.java
index 1c149ed..cac5a65 100644
--- a/dev/core/super/com/google/gwt/dev/jjs/intrinsic/com/google/gwt/lang/JavaClassHierarchySetupUtil.java
+++ b/dev/core/super/com/google/gwt/dev/jjs/intrinsic/com/google/gwt/lang/JavaClassHierarchySetupUtil.java
@@ -87,14 +87,11 @@
    */
   private static native JavaScriptObject createSubclassPrototype(
       JavaScriptObject superTypeIdOrPrototype) /*-{
-    var superPrototype;
-    if (typeof superTypeIdOrPrototype != 'number') {
-      // Either it is null or the prototype of the super type.
-      superPrototype = (superTypeIdOrPrototype && superTypeIdOrPrototype.prototype) || {};
-    } else {
+    var superPrototype = superTypeIdOrPrototype && superTypeIdOrPrototype.prototype;
+    if (!superPrototype) {
+      // If it is not a prototype, then it should be a type id.
       superPrototype = @JavaClassHierarchySetupUtil::prototypesByTypeId[superTypeIdOrPrototype];
     }
-
     return @JavaClassHierarchySetupUtil::portableObjCreate(*)(superPrototype);
   }-*/;