Remove experimental code.

pull/1/head
Brett Wooldridge 11 years ago
parent 615a74aace
commit 8fcbc29ce9

@ -35,8 +35,6 @@ import javassist.CtNewMethod;
import javassist.Modifier; import javassist.Modifier;
import javassist.bytecode.AnnotationsAttribute; import javassist.bytecode.AnnotationsAttribute;
import javassist.bytecode.ClassFile; import javassist.bytecode.ClassFile;
import javassist.bytecode.CodeAttribute;
import javassist.bytecode.CodeIterator;
import javassist.bytecode.ConstPool; import javassist.bytecode.ConstPool;
import javassist.bytecode.annotation.Annotation; import javassist.bytecode.annotation.Annotation;
@ -165,14 +163,12 @@ public class HikariClassTransformer implements ClassFileTransformer
mergeClassInitializers(proxy, target, classFile); mergeClassInitializers(proxy, target, classFile);
specialConnectionInjectCloseCheck(target); specialConnectionInjectCloseCheck(target);
injectTryCatch(target); injectTryCatch(target);
// redactCheckcast(target);
for (CtConstructor constructor : target.getConstructors()) for (CtConstructor constructor : target.getConstructors())
{ {
constructor.insertAfter("__init();"); constructor.insertAfter("__init();");
} }
target.debugWriteFile("/tmp");
return target.toBytecode(); return target.toBytecode();
} }
@ -194,10 +190,7 @@ public class HikariClassTransformer implements ClassFileTransformer
copyMethods(proxy, target, classFile); copyMethods(proxy, target, classFile);
mergeClassInitializers(proxy, target, classFile); mergeClassInitializers(proxy, target, classFile);
injectTryCatch(target); injectTryCatch(target);
// redactCheckcast(target);
target.rebuildClassFile();
target.debugWriteFile("/tmp");
return target.toBytecode(); return target.toBytecode();
} }
@ -338,28 +331,6 @@ public class HikariClassTransformer implements ClassFileTransformer
} }
} }
private void redactCheckcast(CtClass targetClass) throws Exception
{
for (CtMethod method : targetClass.getMethods())
{
CodeAttribute codeAttribute = method.getMethodInfo().getCodeAttribute();
if (codeAttribute == null)
{
continue;
}
CodeIterator byteCodeIterator = codeAttribute.iterator();
while (byteCodeIterator.hasNext()) {
int index = byteCodeIterator.next();
int op = byteCodeIterator.byteAt(index);
if (op == CodeIterator.CHECKCAST)
{
byteCodeIterator.write(new byte[3], index); // replace with NOP
}
}
}
}
/** /**
* *
*/ */

Loading…
Cancel
Save