Author: almaw
Date: Wed Sep 5 02:20:49 2007
New Revision: 572916
URL: http://svn.apache.org/viewvc?rev=572916&view=rev
Log:
Put back in null check.
Modified:
wicket/trunk/jdk-1.5/wicket-guice/src/main/java/org/apache/wicket/guice/GuiceComponentInjector.java
Modified:
wicket/trunk/jdk-1.5/wicket-guice/src/main/java/org/apache/wicket/guice/GuiceComponentInjector.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/jdk-1.5/wicket-guice/src/main/java/org/apache/wicket/guice/GuiceComponentInjector.java?rev=572916&r1=572915&r2=572916&view=diff
==============================================================================
---
wicket/trunk/jdk-1.5/wicket-guice/src/main/java/org/apache/wicket/guice/GuiceComponentInjector.java
(original)
+++
wicket/trunk/jdk-1.5/wicket-guice/src/main/java/org/apache/wicket/guice/GuiceComponentInjector.java
Wed Sep 5 02:20:49 2007
@@ -167,7 +167,8 @@
}
current = current.getSuperclass();
}
- while (current != Object.class);
+ // Do a null check in case Object isn't in the current
classloader.
+ while (current != null && current != Object.class);
}
public void onInstantiation(Component component)
