[jboss-cvs] JBossAS SVN: r68224 - branches/JBPAPP_4_2_0_GA_CP/build.

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

Author: jhowell at redhat.com
Date: 2007-12-12 23:43:47 -0500 (Wed, 12 Dec 2007)
New Revision: 68224

Modified:
   branches/JBPAPP_4_2_0_GA_CP/build/build-thirdparty.xml
Log:
[JBPAPP-355] The original problem that was fixed is that values, keySet, and entrySet toArray() methods were not thread safe. Oswego put a fix in there that used an iterator to build a secondary collection that we then call toArray with. This was the bug that was fixed. JBAS-4698. It doesn't look like that fix was ever moved into the cp. Actually there were a couple fixes in the oswego libraries that Adrian fixed, that didn't look like they were in EAP 4.2 CP/4.3. The version of the oswego libaries that was released for this fix(it went into 4.2.2) was 1.3.4-jboss(https://svn.jboss.org/repos/repository.jboss.org/oswego-concurrent/1.3.4-jboss/)

The problem with the 1.3.4-jboss fix is that if an entry is removed, then it leaves a null in the map. When iterating through the collections the null would be propagated to the temporary collection being used to convert to an array. The end result was that when toArray() is called, it throws a null pointer exception. So the new version 1.3.4-jboss-update1 has that fix in there. So I put a check for a null in there for the values, keyset, and entry collections. This version of the oswego libraries that was just released is 1.3.4-jboss-update1.(https://svn.jboss.org/repos/repository.jboss.org/oswego-concurrent/1.3.4-jboss-update1). 

Modified: branches/JBPAPP_4_2_0_GA_CP/build/build-thirdparty.xml
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/build/build-thirdparty.xml	2007-12-13 03:06:27 UTC (rev 68223)
+++ branches/JBPAPP_4_2_0_GA_CP/build/build-thirdparty.xml	2007-12-13 04:43:47 UTC (rev 68224)
@@ -109,7 +109,7 @@
     <componentref name="junit" version="3.8.2-brew"/>
     <componentref name="objectweb-joramtests" version="1.5"/>
     <componentref name="odmg" version="3.0-brew"/>
-    <componentref name="oswego-concurrent" version="1.3.4-brew"/>
+    <componentref name="oswego-concurrent" version="1.3.4-jboss-update1"/>
     <componentref name="quartz" version="1.5.2-brew"/>
     <componentref name="qdox" version="1.6.1-brew"/>
     <componentref name="stax-api" version="1.0"/>