Skip to content
Snippets Groups Projects
Commit ad33ee1f authored by ribeaudc's avatar ribeaudc
Browse files

fix:

- '(Object[]) null' does not mean '(Object) null'.

SVN: 2936
parent 5a7ac362
No related branches found
No related tags found
No related merge requests found
...@@ -165,7 +165,8 @@ public final class ClassUtils ...@@ -165,7 +165,8 @@ public final class ClassUtils
+ "' can not be instanciated as it is an interface."; + "' can not be instanciated as it is an interface.";
assert superClazz.isAssignableFrom(clazz) : "Class '" + clazz.getName() + "' does not implements/extends '" assert superClazz.isAssignableFrom(clazz) : "Class '" + clazz.getName() + "' does not implements/extends '"
+ superClazz.getName() + "'."; + superClazz.getName() + "'.";
if (initargs == null) // (Object[]) null ||(Object) null
if (initargs == null || (initargs.length == 1 && initargs[0] == null))
{ {
return createInstance(clazz); return createInstance(clazz);
} }
......
...@@ -82,7 +82,7 @@ public final class ClassUtilsTest ...@@ -82,7 +82,7 @@ public final class ClassUtilsTest
@Test @Test
public void testCreateWithDefaultConstructor() public void testCreateWithDefaultConstructor()
{ {
CharSequence cs = ClassUtils.create(CharSequence.class, StringBuffer.class.getName(), (Object) null); CharSequence cs = ClassUtils.create(CharSequence.class, StringBuffer.class.getName(), (Object[]) null);
assertTrue(cs instanceof StringBuffer); assertTrue(cs instanceof StringBuffer);
assertEquals(0, cs.length()); assertEquals(0, cs.length());
} }
...@@ -132,7 +132,7 @@ public final class ClassUtilsTest ...@@ -132,7 +132,7 @@ public final class ClassUtilsTest
{ {
try try
{ {
ClassUtils.create(Float.class, Integer.class.getName(), (Object) null); ClassUtils.create(Float.class, Integer.class.getName(), (Object[]) null);
fail("AssertionError expected."); fail("AssertionError expected.");
} catch (AssertionError e) } catch (AssertionError e)
{ {
...@@ -145,7 +145,7 @@ public final class ClassUtilsTest ...@@ -145,7 +145,7 @@ public final class ClassUtilsTest
{ {
try try
{ {
ClassUtils.create(Float.class, CharSequence.class.getName(), (Object) null); ClassUtils.create(Float.class, CharSequence.class.getName(), (Object[]) null);
fail("AssertionError expected."); fail("AssertionError expected.");
} catch (AssertionError e) } catch (AssertionError e)
{ {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment