You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by cl...@apache.org on 2011/11/14 10:56:14 UTC

svn commit: r1201650 - in /felix/trunk/ipojo: ant/pom.xml manipulator/src/main/java/org/apache/felix/ipojo/manipulation/Manipulator.java

Author: clement
Date: Mon Nov 14 09:56:14 2011
New Revision: 1201650

URL: http://svn.apache.org/viewvc?rev=1201650&view=rev
Log:
Fixed FELIX-3145
* The ant task must embeds the classes from the new manipulator
* The manipulator must computes the frame.

Modified:
    felix/trunk/ipojo/ant/pom.xml
    felix/trunk/ipojo/manipulator/src/main/java/org/apache/felix/ipojo/manipulation/Manipulator.java

Modified: felix/trunk/ipojo/ant/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/ant/pom.xml?rev=1201650&r1=1201649&r2=1201650&view=diff
==============================================================================
--- felix/trunk/ipojo/ant/pom.xml (original)
+++ felix/trunk/ipojo/ant/pom.xml Mon Nov 14 09:56:14 2011
@@ -74,7 +74,7 @@
             <Bundle-Description> iPOJO Ant Task </Bundle-Description>
             <Bundle-DocURL>http://felix.apache.org/site/ipojo-ant-task.html</Bundle-DocURL>
             <Private-Package> org.apache.felix.ipojo.metadata,
-              org.apache.felix.ipojo.manipulator,
+              org.apache.felix.ipojo.manipulator*,
               org.apache.felix.ipojo.xml.parser,
               org.apache.felix.ipojo.manipulation*,
               org.objectweb.asm.util;-split-package:=merge-first,

Modified: felix/trunk/ipojo/manipulator/src/main/java/org/apache/felix/ipojo/manipulation/Manipulator.java
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/manipulator/src/main/java/org/apache/felix/ipojo/manipulation/Manipulator.java?rev=1201650&r1=1201649&r2=1201650&view=diff
==============================================================================
--- felix/trunk/ipojo/manipulator/src/main/java/org/apache/felix/ipojo/manipulation/Manipulator.java (original)
+++ felix/trunk/ipojo/manipulator/src/main/java/org/apache/felix/ipojo/manipulation/Manipulator.java Mon Nov 14 09:56:14 2011
@@ -94,7 +94,7 @@ public class Manipulator {
             // Instrument all fields
             InputStream is2 = new ByteArrayInputStream(origin);
             ClassReader cr0 = new ClassReader(is2);
-            ClassWriter cw0 = new ClassWriter(ClassWriter.COMPUTE_MAXS);
+            ClassWriter cw0 = new ClassWriter(ClassWriter.COMPUTE_MAXS  | ClassWriter.COMPUTE_FRAMES);
             //CheckClassAdapter ch = new CheckClassAdapter(cw0);
             MethodCreator preprocess = new MethodCreator(cw0, m_fields, m_methods);
             cr0.accept(preprocess, ClassReader.SKIP_FRAMES);