[jboss-svn-commits] JBL Code SVN: r36689 - labs/jbosstm/workspace/emma/emma-2.0.5312-trunk/core/java12/com/vladium/emma/instr.

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

Author: adinn
Date: 2011-02-24 09:21:10 -0500 (Thu, 24 Feb 2011)
New Revision: 36689

Modified:
   labs/jbosstm/workspace/emma/emma-2.0.5312-trunk/core/java12/com/vladium/emma/instr/InstrVisitor.java
Log:
stopped emma adding the synthetic attribute to generated <clinit> methods because this causes problems when the JVM tries to retransform the resulting bytecode -- fixes JBOSSTS-826

Modified: labs/jbosstm/workspace/emma/emma-2.0.5312-trunk/core/java12/com/vladium/emma/instr/InstrVisitor.java
===================================================================
--- labs/jbosstm/workspace/emma/emma-2.0.5312-trunk/core/java12/com/vladium/emma/instr/InstrVisitor.java	2011-02-24 14:08:18 UTC (rev 36688)
+++ labs/jbosstm/workspace/emma/emma-2.0.5312-trunk/core/java12/com/vladium/emma/instr/InstrVisitor.java	2011-02-24 14:21:10 UTC (rev 36689)
@@ -487,8 +487,11 @@
             final int descriptor_index = cls.addCONSTANT_Utf8 ("()V", true);
             
             final IAttributeCollection attributes;
-            
-            if (MARK_ADDED_ELEMENTS_SYNTHETIC)
+
+            // never mark a CLINIT as synthetic as it causes problems when the class
+            // is retransformed
+            //if (MARK_ADDED_ELEMENTS_SYNTHETIC)
+            if (false)
                 attributes = ElementFactory.newAttributeCollection (2);
             else
                 attributes = ElementFactory.newAttributeCollection (1);
@@ -501,7 +504,10 @@
                 
             attributes.add (code);
             
-            if (MARK_ADDED_ELEMENTS_SYNTHETIC)
+            // never mark a CLINIT as synthetic as it causes problems when the class
+            // is retransformed
+            //if (MARK_ADDED_ELEMENTS_SYNTHETIC)
+            if (false)
             {
                 attributes.add (new SyntheticAttribute_info (m_syntheticStringIndex));
             }