branch | emul |
changeset 643 | a2c0afa35c09 |
parent 604 | 3fcc279c921b |
child 666 | 8338ab1991e6 |
child 733 | 25eba32a96cd |
1.1 --- a/emul/mini/src/main/java/java/lang/Class.java Mon Jan 28 18:15:21 2013 +0100 1.2 +++ b/emul/mini/src/main/java/java/lang/Class.java Fri Feb 01 18:35:21 2013 +0100 1.3 @@ -347,6 +347,9 @@ 1.4 * @since JDK1.1 1.5 */ 1.6 public boolean isInstance(Object obj) { 1.7 + if (obj == null) { 1.8 + return false; 1.9 + } 1.10 if (isArray()) { 1.11 return isAssignableFrom(obj.getClass()); 1.12 }