aries-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dav...@apache.org
Subject svn commit: r1332555 - /aries/trunk/spi-fly/spi-fly-weaver/src/main/java/org/apache/aries/spifly/weaver/TCCLSetterVisitor.java
Date Tue, 01 May 2012 07:43:59 GMT
Author: davidb
Date: Tue May  1 07:43:58 2012
New Revision: 1332555

URL: http://svn.apache.org/viewvc?rev=1332555&view=rev
Log:
Fix for a bug that previously too many classes were enhanced.

Modified:
    aries/trunk/spi-fly/spi-fly-weaver/src/main/java/org/apache/aries/spifly/weaver/TCCLSetterVisitor.java

Modified: aries/trunk/spi-fly/spi-fly-weaver/src/main/java/org/apache/aries/spifly/weaver/TCCLSetterVisitor.java
URL: http://svn.apache.org/viewvc/aries/trunk/spi-fly/spi-fly-weaver/src/main/java/org/apache/aries/spifly/weaver/TCCLSetterVisitor.java?rev=1332555&r1=1332554&r2=1332555&view=diff
==============================================================================
--- aries/trunk/spi-fly/spi-fly-weaver/src/main/java/org/apache/aries/spifly/weaver/TCCLSetterVisitor.java
(original)
+++ aries/trunk/spi-fly/spi-fly-weaver/src/main/java/org/apache/aries/spifly/weaver/TCCLSetterVisitor.java
Tue May  1 07:43:58 2012
@@ -46,7 +46,7 @@ public class TCCLSetterVisitor extends C
     private static final Type UTIL_CLASS = Type.getType(Util.class);
 
     private static final Type CLASS_TYPE = Type.getType(Class.class);
-    
+
     private static final Type String_TYPE = Type.getType(String.class);
 
     private final Type targetClass;
@@ -56,6 +56,9 @@ public class TCCLSetterVisitor extends C
     // (to the Util.class.getPackage()) is needed.
     private boolean additionalImportRequired = false;
 
+    // This field is true when the class was woven
+    private boolean woven = false;
+
     public TCCLSetterVisitor(ClassVisitor cv, String className, Set<WeavingData> weavingData)
{
         super(cv);
         this.targetClass = Type.getType("L" + className.replace('.', '/') + ";");
@@ -73,6 +76,15 @@ public class TCCLSetterVisitor extends C
 
     @Override
     public void visitEnd() {
+        if (!woven) {
+            System.out.println("+++ not woven: " + targetClass);
+            // if this class wasn't woven, then don't add the synthesized method either.
+            super.visitEnd();
+            return;
+        } else {
+            System.out.println("+++ woven: " + targetClass);
+        }
+
         // Add generated static method
         Set<String> methodNames = new HashSet<String>();
 
@@ -88,25 +100,25 @@ public class TCCLSetterVisitor extends C
 
              methodNames.add(methodName);
              Method method = new Method(methodName, Type.VOID_TYPE, new Type[] {CLASS_TYPE});
-             
+
              GeneratorAdapter mv = new GeneratorAdapter(cv.visitMethod(ACC_PRIVATE + ACC_STATIC,
methodName,
                      method.getDescriptor(), null, null), ACC_PRIVATE + ACC_STATIC, methodName,
                      method.getDescriptor());
-             
+
              //Load the strings, method parameter and target
              mv.visitLdcInsn(wd.getClassName());
              mv.visitLdcInsn(wd.getMethodName());
              mv.loadArg(0);
              mv.visitLdcInsn(targetClass);
-             
+
              //Change the class on the stack into a classloader
-             mv.invokeVirtual(CLASS_TYPE, new Method("getClassLoader", 
+             mv.invokeVirtual(CLASS_TYPE, new Method("getClassLoader",
                  CLASSLOADER_TYPE, new Type[0]));
-             
+
              //Call our util method
-             mv.invokeStatic(UTIL_CLASS, new Method("fixContextClassloader", Type.VOID_TYPE,

+             mv.invokeStatic(UTIL_CLASS, new Method("fixContextClassloader", Type.VOID_TYPE,
                  new Type[] {String_TYPE, String_TYPE, CLASS_TYPE, CLASSLOADER_TYPE}));
-             
+
              mv.returnValue();
              mv.endMethod();
         }
@@ -165,18 +177,19 @@ public class TCCLSetterVisitor extends C
                 System.out.println("+++ Gotcha!");
 
                 additionalImportRequired = true;
-                
+                woven = true;
+
                 Label startTry = newLabel();
                 Label endTry = newLabel();
-                
+
                 //start try block
                 visitTryCatchBlock(startTry, endTry, endTry, null);
                 mark(startTry);
-                
+
                 // Add: Util.storeContextClassloader();
                 invokeStatic(UTIL_CLASS, new Method("storeContextClassloader", Type.VOID_TYPE,
new Type[0]));
-                
-                
+
+
                 // Add: MyClass.$$FCCL$$<classname>$<methodname>(<class>);
                 if (ServiceLoader.class.getName().equals(wd.getClassName()) &&
                     "load".equals(wd.getMethodName()) &&
@@ -184,7 +197,7 @@ public class TCCLSetterVisitor extends C
                     // ServiceLoader.load() is a special case because it's a general-purpose
service loader,
                     // therefore, the target class it the class being passed in to the ServiceLoader.load()
                     // call itself.
-                    
+
                     mv.visitLdcInsn(lastLDCType);
                 } else {
                     // In any other case, we're not dealing with a general-purpose service
loader, but rather
@@ -202,14 +215,14 @@ public class TCCLSetterVisitor extends C
                 //If no exception then go to the finally (finally blocks are a catch block
with a jump)
                 Label afterCatch = newLabel();
                 goTo(afterCatch);
-                
-                
-                //start the catch 
+
+
+                //start the catch
                 mark(endTry);
                 //Run the restore method then throw on the exception
                 invokeStatic(UTIL_CLASS, new Method("restoreContextClassloader", Type.VOID_TYPE,
new Type[0]));
                 throwException();
-                
+
                 //start the finally
                 mark(afterCatch);
                 //Run the restore and continue



Mime
View raw message