commit 380d25f93c054935f1f730712a246591fb7e47a4
author Sebastian Bazley <sebb@apache.org> Thu Mar 27 13:27:48 2014 +0000
committer Sebastian Bazley <sebb@apache.org> Thu Mar 27 13:27:48 2014 +0000
tree f300fdf36593e17388805c205342509108536df8
parent d92757033dd0e6ce6ff6a12306d94af30d6feb0f

Explicit boxing needed here

git-svn-id: https://svn.apache.org/repos/asf/commons/proper/proxy/trunk@1582296 13f79535-47bb-0310-9956-ffa450edef68

core/src/main/java/org/apache/commons/proxy2/ProxyUtils.java

diff --git a/core/src/main/java/org/apache/commons/proxy2/ProxyUtils.java b/core/src/main/java/org/apache/commons/proxy2/ProxyUtils.java
index 54eb518..b558dbd 100644
--- a/core/src/main/java/org/apache/commons/proxy2/ProxyUtils.java
+++ b/core/src/main/java/org/apache/commons/proxy2/ProxyUtils.java
@@ -58,13 +58,13 @@
 

     static

     {

-        NULL_VALUE_MAP.put(Integer.TYPE, 0);

-        NULL_VALUE_MAP.put(Long.TYPE, (long) 0);

-        NULL_VALUE_MAP.put(Short.TYPE, (short) 0);

-        NULL_VALUE_MAP.put(Byte.TYPE, (byte) 0);

-        NULL_VALUE_MAP.put(Float.TYPE, 0.0f);

-        NULL_VALUE_MAP.put(Double.TYPE, 0.0);

-        NULL_VALUE_MAP.put(Character.TYPE, (char) 0);

+        NULL_VALUE_MAP.put(Integer.TYPE, Integer.valueOf(0));

+        NULL_VALUE_MAP.put(Long.TYPE, Long.valueOf(0));

+        NULL_VALUE_MAP.put(Short.TYPE, Short.valueOf((short) 0));

+        NULL_VALUE_MAP.put(Byte.TYPE, Byte.valueOf((byte) 0));

+        NULL_VALUE_MAP.put(Float.TYPE, Float.valueOf(0.0f));

+        NULL_VALUE_MAP.put(Double.TYPE, Double.valueOf(0.0));

+        NULL_VALUE_MAP.put(Character.TYPE, Character.valueOf((char) 0));

         NULL_VALUE_MAP.put(Boolean.TYPE, Boolean.FALSE);

     }

 

core/src/test/java/org/apache/commons/proxy2/ProxyUtilsTest.java

diff --git a/core/src/test/java/org/apache/commons/proxy2/ProxyUtilsTest.java b/core/src/test/java/org/apache/commons/proxy2/ProxyUtilsTest.java
index bd77730..943e8ba 100644
--- a/core/src/test/java/org/apache/commons/proxy2/ProxyUtilsTest.java
+++ b/core/src/test/java/org/apache/commons/proxy2/ProxyUtilsTest.java
@@ -60,15 +60,16 @@
     @Test
     public void testNullValue()
     {
+        // expecting objects so test against explicit objects rather than using autoboxing
         assertNullValue(null, String.class);
-        assertNullValue((char) 0, Character.TYPE);
-        assertNullValue(0, Integer.TYPE);
-        assertNullValue((long) 0, Long.TYPE);
-        assertNullValue((short) 0, Short.TYPE);
-        assertNullValue((double) 0, Double.TYPE);
-        assertNullValue((float) 0, Float.TYPE);
-        assertNullValue(false, Boolean.TYPE);
-        assertNullValue((byte) 0, Byte.TYPE);
+        assertNullValue(Character.valueOf((char) 0), Character.TYPE);
+        assertNullValue(Integer.valueOf(0), Integer.TYPE);
+        assertNullValue(Long.valueOf(0), Long.TYPE);
+        assertNullValue(Short.valueOf((short) 0), Short.TYPE);
+        assertNullValue(Double.valueOf(0), Double.TYPE);
+        assertNullValue(Float.valueOf(0), Float.TYPE);
+        assertNullValue(Boolean.FALSE, Boolean.TYPE);
+        assertNullValue(Byte.valueOf((byte) 0), Byte.TYPE);
     }
 
     private void assertNullValue(Object expected, Class<?> type)