[gwt-contrib] Allowing null clinit. (issue310803)

[aizatsky]

Reviewers: Lex,

Description:
Allowing null clinit.

Please review this at http://gwt-code-reviews.appspot.com/310803/show

Affected files:
  M dev/core/src/com/google/gwt/dev/jjs/ast/JDeclaredType.java


Index: dev/core/src/com/google/gwt/dev/jjs/ast/JDeclaredType.java
===================================================================
--- dev/core/src/com/google/gwt/dev/jjs/ast/JDeclaredType.java	(revision  
7889)
+++ dev/core/src/com/google/gwt/dev/jjs/ast/JDeclaredType.java	(working  
copy)
@@ -16,6 +16,7 @@
 package com.google.gwt.dev.jjs.ast;

 import com.google.gwt.dev.jjs.SourceInfo;
+import com.google.gwt.dev.util.Preconditions;
 import com.google.gwt.dev.util.collect.Lists;

 import java.io.IOException;
@@ -287,10 +288,15 @@
     if (clinitTarget == newClinitTarget) {
       return;
     }
-    if (getClass().desiredAssertionStatus()) {
+    if (newClinitTarget != null && getClass().desiredAssertionStatus()) {
       // Make sure this is a pure upgrade to a superclass or null.
       for (JDeclaredType current = clinitTarget; current !=  
newClinitTarget; current = current.getSuperClass()) {
-        assert current.getSuperClass() != null;
+        Preconditions.checkNotNull(current.getSuperClass(),
+            "Null super class for: %s (currentTarget: %s; newTarget: %s)  
in %s",
+            current,
+            clinitTarget,
+            newClinitTarget,
+            this);
       }
     }
     clinitTarget = newClinitTarget;


--
http://groups.google.com/group/Google-Web-Toolkit-Contributors

To unsubscribe, reply using "remove me" as the subject.