You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by se...@apache.org on 2014/03/27 16:07:16 UTC

svn commit: r1582338 - in /commons/proper/proxy/trunk: asm4/src/main/java/org/apache/commons/proxy2/asm4/ cglib/src/main/java/org/apache/commons/proxy2/cglib/ core/src/main/java/org/apache/commons/proxy2/stub/ jdk/src/main/java/org/apache/commons/proxy...

Author: sebb
Date: Thu Mar 27 15:07:16 2014
New Revision: 1582338

URL: http://svn.apache.org/r1582338
Log:
Explicit boxing

Modified:
    commons/proper/proxy/trunk/asm4/src/main/java/org/apache/commons/proxy2/asm4/ASM4ProxyFactory.java
    commons/proper/proxy/trunk/cglib/src/main/java/org/apache/commons/proxy2/cglib/CglibProxyFactory.java
    commons/proper/proxy/trunk/core/src/main/java/org/apache/commons/proxy2/stub/AnnotationBuilder.java
    commons/proper/proxy/trunk/jdk/src/main/java/org/apache/commons/proxy2/jdk/JdkProxyFactory.java

Modified: commons/proper/proxy/trunk/asm4/src/main/java/org/apache/commons/proxy2/asm4/ASM4ProxyFactory.java
URL: http://svn.apache.org/viewvc/commons/proper/proxy/trunk/asm4/src/main/java/org/apache/commons/proxy2/asm4/ASM4ProxyFactory.java?rev=1582338&r1=1582337&r2=1582338&view=diff
==============================================================================
--- commons/proper/proxy/trunk/asm4/src/main/java/org/apache/commons/proxy2/asm4/ASM4ProxyFactory.java (original)
+++ commons/proper/proxy/trunk/asm4/src/main/java/org/apache/commons/proxy2/asm4/ASM4ProxyFactory.java Thu Mar 27 15:07:16 2014
@@ -388,11 +388,11 @@ public class ASM4ProxyFactory extends Ab
         {
             if (isHashCode(method))
             {
-                return System.identityHashCode(proxy);
+                return Integer.valueOf(System.identityHashCode(proxy));
             }
             if (isEqualsMethod(method))
             {
-                return proxy == args[0];
+                return Boolean.valueOf(proxy == args[0]);
             }
             return invokeImpl(proxy, method, args);
         }

Modified: commons/proper/proxy/trunk/cglib/src/main/java/org/apache/commons/proxy2/cglib/CglibProxyFactory.java
URL: http://svn.apache.org/viewvc/commons/proper/proxy/trunk/cglib/src/main/java/org/apache/commons/proxy2/cglib/CglibProxyFactory.java?rev=1582338&r1=1582337&r2=1582338&view=diff
==============================================================================
--- commons/proper/proxy/trunk/cglib/src/main/java/org/apache/commons/proxy2/cglib/CglibProxyFactory.java (original)
+++ commons/proper/proxy/trunk/cglib/src/main/java/org/apache/commons/proxy2/cglib/CglibProxyFactory.java Thu Mar 27 15:07:16 2014
@@ -136,7 +136,7 @@ public class CglibProxyFactory extends A
         @Override
         public Object intercept(Object o, Method method, Object[] objects, MethodProxy methodProxy) throws Throwable
         {
-            return o == objects[0];
+            return Boolean.valueOf(o == objects[0]);
         }
     }
 
@@ -148,7 +148,7 @@ public class CglibProxyFactory extends A
         @Override
         public Object intercept(Object o, Method method, Object[] objects, MethodProxy methodProxy) throws Throwable
         {
-            return System.identityHashCode(o);
+            return Integer.valueOf(System.identityHashCode(o));
         }
     }
 

Modified: commons/proper/proxy/trunk/core/src/main/java/org/apache/commons/proxy2/stub/AnnotationBuilder.java
URL: http://svn.apache.org/viewvc/commons/proper/proxy/trunk/core/src/main/java/org/apache/commons/proxy2/stub/AnnotationBuilder.java?rev=1582338&r1=1582337&r2=1582338&view=diff
==============================================================================
--- commons/proper/proxy/trunk/core/src/main/java/org/apache/commons/proxy2/stub/AnnotationBuilder.java (original)
+++ commons/proper/proxy/trunk/core/src/main/java/org/apache/commons/proxy2/stub/AnnotationBuilder.java Thu Mar 27 15:07:16 2014
@@ -65,12 +65,12 @@ public class AnnotationBuilder<A extends
         {
             if (ProxyUtils.isHashCode(method))
             {
-                return AnnotationUtils.hashCode((Annotation) proxy);
+                return Integer.valueOf(AnnotationUtils.hashCode((Annotation) proxy));
             }
             if (ProxyUtils.isEqualsMethod(method))
             {
-                return args[0] instanceof Annotation
-                        && AnnotationUtils.equals((Annotation) proxy, (Annotation) args[0]);
+                return Boolean.valueOf(args[0] instanceof Annotation
+                        && AnnotationUtils.equals((Annotation) proxy, (Annotation) args[0]));
             }
             if ("toString".equals(method.getName()) && method.getParameterTypes().length == 0)
             {

Modified: commons/proper/proxy/trunk/jdk/src/main/java/org/apache/commons/proxy2/jdk/JdkProxyFactory.java
URL: http://svn.apache.org/viewvc/commons/proper/proxy/trunk/jdk/src/main/java/org/apache/commons/proxy2/jdk/JdkProxyFactory.java?rev=1582338&r1=1582337&r2=1582338&view=diff
==============================================================================
--- commons/proper/proxy/trunk/jdk/src/main/java/org/apache/commons/proxy2/jdk/JdkProxyFactory.java (original)
+++ commons/proper/proxy/trunk/jdk/src/main/java/org/apache/commons/proxy2/jdk/JdkProxyFactory.java Thu Mar 27 15:07:16 2014
@@ -116,11 +116,11 @@ public class JdkProxyFactory extends Abs
         {
             if (ProxyUtils.isHashCode(method))
             {
-                return System.identityHashCode(proxy);
+                return Integer.valueOf(System.identityHashCode(proxy));
             }
             else if (ProxyUtils.isEqualsMethod(method))
             {
-                return proxy == args[0];
+                return Boolean.valueOf(proxy == args[0]);
             }
             else
             {