svn commit: r1641483 - in /openjpa/branches/2.2.x/openjpa-kernel/src/main/java/org/apache/openjpa/util: ProxyConcurrentMaps.java ProxyManagerImpl.java

[jgrassel]

Author: jgrassel
Date: Mon Nov 24 21:43:07 2014
New Revision: 1641483

URL: http://svn.apache.org/r1641483
Log:
OPENJPA-2442: java.lang.VerifyError in TestProxyManager when loading a 
dynamically created custom proxy class on Oracle Java 8 [JDK8]

Modified:
    
openjpa/branches/2.2.x/openjpa-kernel/src/main/java/org/apache/openjpa/util/ProxyConcurrentMaps.java
    
openjpa/branches/2.2.x/openjpa-kernel/src/main/java/org/apache/openjpa/util/ProxyManagerImpl.java

Modified: 
openjpa/branches/2.2.x/openjpa-kernel/src/main/java/org/apache/openjpa/util/ProxyConcurrentMaps.java
URL: 
http://svn.apache.org/viewvc/openjpa/branches/2.2.x/openjpa-kernel/src/main/java/org/apache/openjpa/util/ProxyConcurrentMaps.java?rev=1641483&r1=1641482&r2=1641483&view=diff
==============================================================================
--- 
openjpa/branches/2.2.x/openjpa-kernel/src/main/java/org/apache/openjpa/util/ProxyConcurrentMaps.java
 (original)
+++ 
openjpa/branches/2.2.x/openjpa-kernel/src/main/java/org/apache/openjpa/util/ProxyConcurrentMaps.java
 Mon Nov 24 21:43:07 2014
@@ -26,7 +26,7 @@ import java.util.Map;
  */
 public class ProxyConcurrentMaps extends ProxyMaps {
        /**
-     * Call before invoking {@link Map#remove} on super.
+     * Call before invoking {@link Map#remove(key, value)} on super.
      */
     public static boolean beforeRemove(ProxyMap map, Object key, Object value) 
{
         dirty(map, false);
@@ -34,7 +34,7 @@ public class ProxyConcurrentMaps extends
     }
     
     /**
-     * Call after invoking {@link Map#remove} on super.
+     * Call after invoking {@link Map#remove(key, value)} on super.
      *
      * @param ret the return value from the super's method
      * @param before the return value from {@link #beforeRemove}

Modified: 
openjpa/branches/2.2.x/openjpa-kernel/src/main/java/org/apache/openjpa/util/ProxyManagerImpl.java
URL: 
http://svn.apache.org/viewvc/openjpa/branches/2.2.x/openjpa-kernel/src/main/java/org/apache/openjpa/util/ProxyManagerImpl.java?rev=1641483&r1=1641482&r2=1641483&view=diff
==============================================================================
--- 
openjpa/branches/2.2.x/openjpa-kernel/src/main/java/org/apache/openjpa/util/ProxyManagerImpl.java
 (original)
+++ 
openjpa/branches/2.2.x/openjpa-kernel/src/main/java/org/apache/openjpa/util/ProxyManagerImpl.java
 Mon Nov 24 21:43:07 2014
@@ -57,7 +57,6 @@ import org.apache.openjpa.lib.util.J2DoP
 import org.apache.openjpa.lib.util.Localizer;
 import org.apache.openjpa.lib.util.Options;
 
-import java.util.concurrent.ConcurrentMap;
 import java.util.concurrent.ConcurrentHashMap;
 
 import serp.bytecode.BCClass;
@@ -614,8 +613,7 @@ public class ProxyManagerImpl
         delegateConstructors(bc, type);
         addProxyMethods(bc, false);
         addProxyMapMethods(bc, type);
-        Class<? extends ProxyMaps> mapProxyClassType =
-            ConcurrentMap.class.isAssignableFrom(type) ? 
ProxyConcurrentMaps.class : ProxyMaps.class;
+        Class<? extends ProxyMaps> mapProxyClassType = 
ProxyConcurrentMaps.class;
         proxyRecognizedMethods(bc, type, mapProxyClassType, ProxyMap.class);
         proxySetters(bc, type);
         addWriteReplaceMethod(bc, runtime);