You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aries.apache.org by ej...@apache.org on 2012/02/17 19:07:20 UTC
svn commit: r1245687 -
/aries/trunk/proxy/proxy-impl/src/main/java/org/apache/aries/proxy/impl/ProxyUtils.java
Author: ejiang
Date: Fri Feb 17 18:07:20 2012
New Revision: 1245687
URL: http://svn.apache.org/viewvc?rev=1245687&view=rev
Log:
ARIES-817: ASM4 for JAVA7 support
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=1245687&r1=1245686&r2=1245687&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 Fri Feb 17 18:07:20 2012
@@ -28,19 +28,21 @@ public class ProxyUtils
{
private static Logger LOGGER = LoggerFactory.getLogger(ProxyUtils.class);
public static int javaClassVersion = new BigDecimal(System.getProperty("java.class.version")).intValue();
+ private static int weavingJavaVersion = -1; // initialise an invalid number
/**
* Get the java version to be woven at.
* @return
*/
public static int getWeavingJavaVersion() {
-
- if (javaClassVersion >= Opcodes.V1_7) {
- LOGGER.debug("Weaving to Java 7");
- return Opcodes.V1_7;
- } else {
- LOGGER.debug("Weaving to Java 6");
- return Opcodes.V1_6;
- }
-
- }
+ if (weavingJavaVersion == -1 ) {
+ if (javaClassVersion >= Opcodes.V1_7) {
+ LOGGER.debug("Weaving to Java 7");
+ weavingJavaVersion = Opcodes.V1_7;
+ } else {
+ LOGGER.debug("Weaving to Java 6");
+ weavingJavaVersion = Opcodes.V1_6;
+ }
+ }
+ return weavingJavaVersion;
+ }
}