Fixed FELIX-3145
* The ant task must embeds the classes from the new manipulator
* The manipulator must computes the frame.
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1201650 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/ipojo/ant/pom.xml b/ipojo/ant/pom.xml
index 59c440e..969d66f 100644
--- a/ipojo/ant/pom.xml
+++ b/ipojo/ant/pom.xml
@@ -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,
diff --git a/ipojo/manipulator/src/main/java/org/apache/felix/ipojo/manipulation/Manipulator.java b/ipojo/manipulator/src/main/java/org/apache/felix/ipojo/manipulation/Manipulator.java
index f7113f4..395a5d9 100644
--- a/ipojo/manipulator/src/main/java/org/apache/felix/ipojo/manipulation/Manipulator.java
+++ b/ipojo/manipulator/src/main/java/org/apache/felix/ipojo/manipulation/Manipulator.java
@@ -94,7 +94,7 @@
// 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);