[jboss-cvs] JBossAS SVN: r103987 - projects/jboss-reflect/trunk/src/main/java/org/jboss/reflect/plugins/javassist/bytecode.

[jboss-cvs-commits at lists.jboss.org]

Author: kabir.khan at jboss.com
Date: 2010-04-15 04:59:05 -0400 (Thu, 15 Apr 2010)
New Revision: 103987

Modified:
   projects/jboss-reflect/trunk/src/main/java/org/jboss/reflect/plugins/javassist/bytecode/JavassistMemberFactory.java
Log:
[JBREFLECT-6] Exclude all parameter checking if check=false

Modified: projects/jboss-reflect/trunk/src/main/java/org/jboss/reflect/plugins/javassist/bytecode/JavassistMemberFactory.java
===================================================================
--- projects/jboss-reflect/trunk/src/main/java/org/jboss/reflect/plugins/javassist/bytecode/JavassistMemberFactory.java	2010-04-15 05:50:27 UTC (rev 103986)
+++ projects/jboss-reflect/trunk/src/main/java/org/jboss/reflect/plugins/javassist/bytecode/JavassistMemberFactory.java	2010-04-15 08:59:05 UTC (rev 103987)
@@ -744,28 +744,28 @@
             code.addInvokespecial(ILLEGAL_ARGUMENT_EXCEPTION_NAME, "<init>", ILLEGAL_ARGUMENT_EXCEPTION_CONSTRUCTOR_DESCRIPTOR);
             code.addOpcode(Opcode.ATHROW);
             code.write16bit(pc1, code.currentPc() - pc1 + 1);
+
+            //if ($1 instanceof TargetType == false) throw new IllegalArgumentException("$1 is not an instance of TargetType");
+            code.addAload(1);
+            code.addInstanceof(targetType); //TODO take parameter
+            code.addOpcode(Opcode.IFNE);
+            pc1 = code.currentPc(); 
+            code.addIndex(0);
+            code.addNew(ILLEGAL_ARGUMENT_EXCEPTION_NAME);
+            code.addOpcode(Opcode.DUP);
+            code.addNew(STRINGBUILDER_NAME);
+            code.addOpcode(Opcode.DUP);
+            code.addLdc("Target: ");
+            code.addInvokespecial(STRINGBUILDER_NAME, "<init>", STRINGBUILDER_CONSTRUCTOR_DESCRIPTOR);
+            code.addAload(1);
+            code.addInvokevirtual(STRINGBUILDER_NAME, "append", STRINGBUILDER_APPEND_DESCRIPTOR);
+            code.addLdc(" is not an instance of " + targetType);
+            code.addInvokevirtual(STRINGBUILDER_NAME, "append", STRINGBUILDER_APPEND_DESCRIPTOR);
+            code.addInvokevirtual(STRINGBUILDER_NAME, "toString", STRINGBUILDER_TOSTRING_DESCRIPTOR);
+            code.addInvokespecial(ILLEGAL_ARGUMENT_EXCEPTION_NAME, "<init>", ILLEGAL_ARGUMENT_EXCEPTION_CONSTRUCTOR_DESCRIPTOR);
+            code.addOpcode(Opcode.ATHROW);
+            code.write16bit(pc1, code.currentPc() - pc1 + 1);
          }        
-         
-         //if ($1 instanceof TargetType == false) throw new IllegalArgumentException("$1 is not an instance of TargetType");
-         code.addAload(1);
-         code.addInstanceof(targetType); //TODO take parameter
-         code.addOpcode(Opcode.IFNE);
-         int pc1 = code.currentPc(); 
-         code.addIndex(0);
-         code.addNew(ILLEGAL_ARGUMENT_EXCEPTION_NAME);
-         code.addOpcode(Opcode.DUP);
-         code.addNew(STRINGBUILDER_NAME);
-         code.addOpcode(Opcode.DUP);
-         code.addLdc("Target: ");
-         code.addInvokespecial(STRINGBUILDER_NAME, "<init>", STRINGBUILDER_CONSTRUCTOR_DESCRIPTOR);
-         code.addAload(1);
-         code.addInvokevirtual(STRINGBUILDER_NAME, "append", STRINGBUILDER_APPEND_DESCRIPTOR);
-         code.addLdc(" is not an instance of " + targetType);
-         code.addInvokevirtual(STRINGBUILDER_NAME, "append", STRINGBUILDER_APPEND_DESCRIPTOR);
-         code.addInvokevirtual(STRINGBUILDER_NAME, "toString", STRINGBUILDER_TOSTRING_DESCRIPTOR);
-         code.addInvokespecial(ILLEGAL_ARGUMENT_EXCEPTION_NAME, "<init>", ILLEGAL_ARGUMENT_EXCEPTION_CONSTRUCTOR_DESCRIPTOR);
-         code.addOpcode(Opcode.ATHROW);
-         code.write16bit(pc1, code.currentPc() - pc1 + 1);
       }      
    }