Added notes on:

- Incompatible BCEL versions and what we think the solution is ;)
- CflowStack changes to improve performance for multi-threaded cflow apps.

3 files changed, 30 insertions, 3 deletions

diff --git a/docs/dist/doc/README-12.html b/docs/dist/doc/README-12.html
index 4aff86ebc..8f9f541ff 100644
--- a/docs/dist/doc/README-12.html
+++ b/docs/dist/doc/README-12.html
@@ -107,7 +107,9 @@ together with <a href="porting.html">porting.html</a>.
   <li>Although not part of <code>aspectjrt.jar</code> this release also provides a new set of
   tools APIs in the <a href="#LTW2"><code>org.aspectj.weaver.tools</code></a> that provide a weaving class loader
   and an adapter that can be used to integrate load-time weaving into an existing class loader
-  hierarchy.<li>
+  hierarchy.</li>
+  <li>Cflow stack management has been modified to use thread local storage on JVMs that support this feature.
+  This improves performance in terms of heap usage for multi-threaded applications that use cflow.
   </ul>
 
 <!-- ============================== -->
diff --git a/docs/dist/doc/changes.html b/docs/dist/doc/changes.html
index 495b0a96a..de2b22ce5 100644
--- a/docs/dist/doc/changes.html
+++ b/docs/dist/doc/changes.html
@@ -144,7 +144,7 @@ All rights reserved.
 <h2>Changes in AspectJ</h2>
 
 <ul>
-  <li> <a href="#1.2">1.2</a> (released 2004-04) 
+  <li> <a href="#1.2">1.2</a> (released 2004-05) 
   </li>
   <li> <a href="#1.1.1">1.1.1</a> (released 2003-09) 
   </li>
@@ -342,7 +342,11 @@ Some of the more significant bug fixes and enhancements include:
      <li><a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=47910">47910</a>
      An output jar file created by AspectJ when using the -outjar option does not contain a 
      valid manifest file. 
-     </li>     
+     </li>
+     <li><a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=59909">59909</a>
+     Thread local storage used to manage cflow stacks when available - improves cflow performance
+     when working with a multi-threaded application.
+     </li>    
   </ul>
 
 <h2><a name="1.1.1">1.1.1</a></h2>
diff --git a/docs/dist/doc/porting.html b/docs/dist/doc/porting.html
index d5c693d12..753ab53d9 100644
--- a/docs/dist/doc/porting.html
+++ b/docs/dist/doc/porting.html
@@ -172,6 +172,27 @@ For more information, see bug
 	<a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=47754">47754</a>.
 </p>
 
+<p><b>Watch for problems due to incompatible BCEL versions.</b>
+AspectJ 1.2 includes a different version of BCEL than AspectJ 1.1.  If you have the older
+version of BCEL available earlier on your classpath than the version included in the 
+1.2 aspectjtools.jar then you will see errors like:
+
+<pre>
+C:\work\test\TestAspect.aj error Internal compiler error
+java.lang.NoSuchMethodError: org.apache.bcel.generic.InstructionFactory.
+createNewArray(Lorg/apache/bcel/generic/Type;S)Lorg/apache/bcel/generic/Instruction;
+</pre>
+
+This typically happens because the old version of BCEL has been included as a standard
+extension in your JVM configuration.  Ensure you have removed it from jre/lib/ext
+under your JDK installation.
+
+<p>For more information, see bugs including
+	<a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=60389">60389</a>,
+	<a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=59921">59921</a>.
+</p>
+
+
 <h2><a name="pre-1.1">Porting pre-1.1 code to AspectJ 1.1</a></h2>
 <a href="README-11.html">README-11.html</a> contains a discussion 
 of the language changes from 1.0 to 1.1.  The high points: