Repository: incubator-johnzon Updated Branches: refs/heads/master 79b8157d2 -> a1246b944
JOHNZON-83 avoid NPE if superclass is null in BaseAccessMode Project: http://git-wip-us.apache.org/repos/asf/incubator-johnzon/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-johnzon/commit/a1246b94 Tree: http://git-wip-us.apache.org/repos/asf/incubator-johnzon/tree/a1246b94 Diff: http://git-wip-us.apache.org/repos/asf/incubator-johnzon/diff/a1246b94 Branch: refs/heads/master Commit: a1246b944ce5f63ff0ba5a5907dbda0d1e9ecfda Parents: 79b8157 Author: Romain manni-Bucau <[email protected]> Authored: Fri Jun 3 16:25:32 2016 +0200 Committer: Romain manni-Bucau <[email protected]> Committed: Fri Jun 3 16:25:32 2016 +0200 ---------------------------------------------------------------------- .../main/java/org/apache/johnzon/mapper/access/BaseAccessMode.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-johnzon/blob/a1246b94/johnzon-mapper/src/main/java/org/apache/johnzon/mapper/access/BaseAccessMode.java ---------------------------------------------------------------------- diff --git a/johnzon-mapper/src/main/java/org/apache/johnzon/mapper/access/BaseAccessMode.java b/johnzon-mapper/src/main/java/org/apache/johnzon/mapper/access/BaseAccessMode.java index ca3e604..0da7531 100644 --- a/johnzon-mapper/src/main/java/org/apache/johnzon/mapper/access/BaseAccessMode.java +++ b/johnzon-mapper/src/main/java/org/apache/johnzon/mapper/access/BaseAccessMode.java @@ -271,7 +271,7 @@ public abstract class BaseAccessMode implements AccessMode { private Class<?> findClass(final Class<?> clazz, final GenericDeclaration genericDeclaration) { - if (clazz == genericDeclaration) { + if (clazz == null || clazz == genericDeclaration) { return clazz; }
