svn commit: r1291486 - /aries/trunk/proxy/proxy-impl/src/main/java/org/apache/aries/proxy/impl/ProxyUtils.java

[ej...@apache.org]

Author: ejiang
Date: Mon Feb 20 22:12:17 2012
New Revision: 1291486

URL: http://svn.apache.org/viewvc?rev=1291486&view=rev
Log:
ARIES-817: JDK7 support - fix the bug of unable to proxy in java5 

Modified:
    aries/trunk/proxy/proxy-impl/src/main/java/org/apache/aries/proxy/impl/ProxyUtils.java

Modified: aries/trunk/proxy/proxy-impl/src/main/java/org/apache/aries/proxy/impl/ProxyUtils.java
URL: http://svn.apache.org/viewvc/aries/trunk/proxy/proxy-impl/src/main/java/org/apache/aries/proxy/impl/ProxyUtils.java?rev=1291486&r1=1291485&r2=1291486&view=diff
==============================================================================
--- aries/trunk/proxy/proxy-impl/src/main/java/org/apache/aries/proxy/impl/ProxyUtils.java (original)
+++ aries/trunk/proxy/proxy-impl/src/main/java/org/apache/aries/proxy/impl/ProxyUtils.java Mon Feb 20 22:12:17 2012
@@ -38,10 +38,13 @@ public class ProxyUtils
       if (javaClassVersion >= Opcodes.V1_7) {
         LOGGER.debug("Weaving to Java 7");
         weavingJavaVersion = Opcodes.V1_7;
-      } else {
+      } else if (javaClassVersion == Opcodes.V1_6){
         LOGGER.debug("Weaving to Java 6");
         weavingJavaVersion = Opcodes.V1_6;
-      }
+      } else if (javaClassVersion == Opcodes.V1_5) {
+        LOGGER.debug("Weaving to Java 5");
+        weavingJavaVersion = Opcodes.V1_5;
+      } // no need to list all Opcodes as Aries should only work with java5 or above.
     } 
     return weavingJavaVersion;
   }