Added/removed null check

forge · Feb 9, 2013 · 0782a96 · 0782a96
1 parent d3f43b0
commit 0782a96
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/proxy/src/main/java/org/jboss/forge/proxy/ClassLoaderAdapterCallback.java b/proxy/src/main/java/org/jboss/forge/proxy/ClassLoaderAdapterCallback.java
@@ -282,7 +282,7 @@ private List<Object> convertParameterValues(final Object[] args, Method delegate
                }
                parameterValues.add(loadedClass);
             }
-            else if (delegateParameterType.isPrimitive() || parameterValue == null)
+            else if (delegateParameterType.isPrimitive())
             {
                parameterValues.add(parameterValue);
             }

diff --git a/proxy/src/main/java/org/jboss/forge/proxy/ProxyTypeInspector.java b/proxy/src/main/java/org/jboss/forge/proxy/ProxyTypeInspector.java
@@ -28,7 +28,7 @@ public static Class<?>[] getCompatibleClassHierarchy(ClassLoader loader, Class<?
          baseClass = baseClass.getSuperclass();
       }
 
-      if (ClassLoaders.containsClass(loader, baseClass.getName())
+      if (baseClass != null && ClassLoaders.containsClass(loader, baseClass.getName())
                && !Object.class.equals(baseClass)
                && (isInstantiable(baseClass) || baseClass.isInterface()))
       {