Revision: 7900
Author: [email protected]
Date: Thu Apr 8 16:12:30 2010
Log: Allowing null clinit.
Review at http://gwt-code-reviews.appspot.com/310803
Review by: [email protected]
http://code.google.com/p/google-web-toolkit/source/detail?r=7900
Modified:
/trunk/dev/core/src/com/google/gwt/dev/jjs/ast/JDeclaredType.java
=======================================
--- /trunk/dev/core/src/com/google/gwt/dev/jjs/ast/JDeclaredType.java Fri
Apr 2 12:42:00 2010
+++ /trunk/dev/core/src/com/google/gwt/dev/jjs/ast/JDeclaredType.java Thu
Apr 8 13:01:34 2010
@@ -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
