[picocontainer-scm] [scm-git][5/5] make use of threadlocal release.
Michael Rimov <git-yCVjj/[email protected]> Fri, 5 Jul 2013 16:25:41 -0500 (CDT)
| Newsgroups | gmane.comp.java.picocontainer.cvs |
|---|---|
| Message-ID | <[email protected]> |
--a65d909d702eacfba735bee18121b3ede9c8abd4 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Content-Disposition: inline commit 71fe6c004d043650996febb1f2ff33078e3f7dc4=0AAuthor: Michael Rimov= <[email protected]>=0AAuthorDate: Fri, 5 Jul 2013 14:23:58 -0700= =0ACommit: Michael Rimov <[email protected]>=0ACommitDate: Fri,= 5 Jul 2013 14:23:58 -0700=0A=0A make use of threadlocal release.=0A=0Ad= iff --git a/modules/picocontainer-modules/src/main/java/com/picocontainer/m= odules/defaults/ModuleSystemDeploymentRegistry.java b/modules/picocontainer= -modules/src/main/java/com/picocontainer/modules/defaults/ModuleSystemDeplo= ymentRegistry.java=0Aindex 320cb56..5e89166 100644=0A--- a/modules/picocont= ainer-modules/src/main/java/com/picocontainer/modules/defaults/ModuleSystem= DeploymentRegistry.java=0A+++ b/modules/picocontainer-modules/src/main/java= /com/picocontainer/modules/defaults/ModuleSystemDeploymentRegistry.java=0A@= @ -16,8 +16,7 @@ public class ModuleSystemDeploymentRegistry {=0A }=0A = =0A public static void deploymentComplete() {=0A- //No clearing yet for J= DK 1.5 :( This is the best we can do for now.=0A- currentDeployingModule.= set(null);=0A+ currentDeployingModule.remove();=0A }=0A =0A public stat= ic PicoModuleSystemSPI getDeployingModuleSystem() {=0Adiff --git a/modules/= picocontainer-modules/src/main/java/com/picocontainer/modules/deployer/Modu= leLayout.java b/modules/picocontainer-modules/src/main/java/com/picocontain= er/modules/deployer/ModuleLayout.java=0Aindex 742832b..12e2b60 100644=0A---= a/modules/picocontainer-modules/src/main/java/com/picocontainer/modules/de= ployer/ModuleLayout.java=0A+++ b/modules/picocontainer-modules/src/main/jav= a/com/picocontainer/modules/deployer/ModuleLayout.java=0A@@ -49,7 +49,7 @@ = public interface ModuleLayout {=0A FileExtensionMapper getFileExtensionMap= per();=0A =0A /**=0A- * Retrieve the espected "base name" for s= cripts. For example, if=0A+ * Retrieve the expected "base name" = for scripts. For example, if=0A * the base name is "picocontainer&qu= ot;, then the deployment script=0A * will be (for example): "picocon= tainer.js", or=0A * "picocontainer.groovy"=0A=0A=0A=0A= --a65d909d702eacfba735bee18121b3ede9c8abd4 Content-Type: text/html; charset=utf-8 Content-Transfer-Encoding: quoted-printable Content-Disposition: inline <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w= 3.org/TR/REC-html40/loose.dtd">=0A<html style=3D"font-size: 12px;">=0A<head= ><meta http-equiv=3D"Content-type" content=3D"text/html; charset=3Dutf-8"><= /head>=0A<body style=3D"font-size: 12px;">=0A<style type=3D"text/css">=0Adt= :after { content: ':' !important; }=0A></style>=0A<dl class=3D"title" style= =3D"font-size: 12px; font-family: Verdana; background-color: #ddd; padding:= 10px;">=0A<dt style=3D"font-size: 12px; float: left; font-weight: bold; mi= n-width: 6em;">Commit</dt>=0A<dd style=3D"font-size: 12px;">71fe6c004d04365= 0996febb1f2ff33078e3f7dc4</dd>=0A<dt style=3D"font-size: 12px; float: left;= font-weight: bold; min-width: 6em;">Branch</dt>=0A<dd style=3D"font-size: = 12px;">master</dd>=0A<dt style=3D"font-size: 12px; float: left; font-weight= : bold; min-width: 6em;">Author</dt>=0A<dd style=3D"font-size: 12px;">Micha= el Rimov <[email protected]></dd>=0A<dt style=3D"font-size: 1= 2px; float: left; font-weight: bold; min-width: 6em;">Date</dt>=0A<dd style= =3D"font-size: 12px;">Fri, 5 Jul 2013 14:23:58 -0700</dd>=0A<dt style=3D"fo= nt-size: 12px; float: left; font-weight: bold; min-width: 6em;">Message</dt= >=0A<dd class=3D"" style=3D"font-size: 12px;">make use of threadlocal relea= se.</dd>=0A</dl>=0A<h2 id=3D"modules/picocontainer-modules/src/main/java/co= m/picocontainer/modules/defaults/ModuleSystemDeploymentRegistry.java" style= =3D"font-size: 12px; font-family: Verdana; font-weight: bold; line-height: = 25px; margin-bottom: 2px; padding-left: 5px; background-color: #bbb;">Chang= ed file modules/picocontainer-modules/src/main/java/com/picocontainer/modul= es/defaults/ModuleSystemDeploymentRegistry.java</h2>=0A=0A<table style=3D"f= ont-size: 12px; width: 100%; border-collapse: collapse;">=0A<tr style=3D"fo= nt-size: 12px;">=0A<td class=3D"ln" style=3D"font-size: 12px; color: #000; = font-family: 'Bitstream Vera Sans Mono','Monaco','Courier',monospace; width= : 23px; text-align: right; background-color: #ccc;" align=3D"right" bgcolor= =3D"#ccc">16</td>=0A<td class=3D"ln" style=3D"font-size: 12px; color: #000;= font-family: 'Bitstream Vera Sans Mono','Monaco','Courier',monospace; widt= h: 23px; text-align: right; background-color: #ccc;" align=3D"right" bgcolo= r=3D"#ccc">16</td>=0A<td style=3D"font-size: 12px; color: #000; font-family= : 'Bitstream Vera Sans Mono','Monaco','Courier',monospace;">=C2=A0=C2=A0=C2= =A0=C2=A0}</td>=0A</tr>=0A<tr style=3D"font-size: 12px;">=0A<td class=3D"ln= " style=3D"font-size: 12px; color: #000; font-family: 'Bitstream Vera Sans = Mono','Monaco','Courier',monospace; width: 23px; text-align: right; backgro= und-color: #ccc;" align=3D"right" bgcolor=3D"#ccc">17</td>=0A<td class=3D"l= n" style=3D"font-size: 12px; color: #000; font-family: 'Bitstream Vera Sans= Mono','Monaco','Courier',monospace; width: 23px; text-align: right; backgr= ound-color: #ccc;" align=3D"right" bgcolor=3D"#ccc">17</td>=0A<td style=3D"= font-size: 12px; color: #000; font-family: 'Bitstream Vera Sans Mono','Mona= co','Courier',monospace;">=C2=A0=C2=A0=C2=A0=C2=A0</td>=0A</tr>=0A<tr style= =3D"font-size: 12px;">=0A<td class=3D"ln" style=3D"font-size: 12px; color: = #000; font-family: 'Bitstream Vera Sans Mono','Monaco','Courier',monospace;= width: 23px; text-align: right; background-color: #ccc;" align=3D"right" b= gcolor=3D"#ccc">18</td>=0A<td class=3D"ln" style=3D"font-size: 12px; color:= #000; font-family: 'Bitstream Vera Sans Mono','Monaco','Courier',monospace= ; width: 23px; text-align: right; background-color: #ccc;" align=3D"right" = bgcolor=3D"#ccc">18</td>=0A<td style=3D"font-size: 12px; color: #000; font-= family: 'Bitstream Vera Sans Mono','Monaco','Courier',monospace;">=C2=A0=C2= =A0=C2=A0=C2=A0public=C2=A0static=C2=A0void=C2=A0deploymentComplete()=C2=A0= {</td>=0A</tr>=0A<tr class=3D"r" style=3D"font-size: 12px; background-color= : #fdd;" bgcolor=3D"#fdd">=0A<td class=3D"ln" style=3D"font-size: 12px; col= or: #000; font-family: 'Bitstream Vera Sans Mono','Monaco','Courier',monosp= ace; width: 23px; text-align: right; background-color: #ccc;" align=3D"righ= t" bgcolor=3D"#ccc">19</td>=0A<td class=3D"ln" style=3D"font-size: 12px; co= lor: #000; font-family: 'Bitstream Vera Sans Mono','Monaco','Courier',monos= pace; width: 23px; text-align: right; background-color: #ccc;" align=3D"rig= ht" bgcolor=3D"#ccc"></td>=0A<td style=3D"font-size: 12px; color: #000; fon= t-family: 'Bitstream Vera Sans Mono','Monaco','Courier',monospace;">=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0//No=C2=A0clearing=C2=A0yet= =C2=A0for=C2=A0JDK=C2=A01.5=C2=A0:(=C2=A0=C2=A0This=C2=A0is=C2=A0the=C2=A0b= est=C2=A0we=C2=A0can=C2=A0do=C2=A0for=C2=A0now.</td>=0A</tr>=0A<tr class=3D= "r" style=3D"font-size: 12px; background-color: #fdd;" bgcolor=3D"#fdd">=0A= <td class=3D"ln" style=3D"font-size: 12px; color: #000; font-family: 'Bitst= ream Vera Sans Mono','Monaco','Courier',monospace; width: 23px; text-align:= right; background-color: #ccc;" align=3D"right" bgcolor=3D"#ccc">20</td>= =0A<td class=3D"ln" style=3D"font-size: 12px; color: #000; font-family: 'Bi= tstream Vera Sans Mono','Monaco','Courier',monospace; width: 23px; text-ali= gn: right; background-color: #ccc;" align=3D"right" bgcolor=3D"#ccc"></td>= =0A<td style=3D"font-size: 12px; color: #000; font-family: 'Bitstream Vera = Sans Mono','Monaco','Courier',monospace;">=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0currentDeployingModule.set(null);</td>=0A</tr>=0A<tr c= lass=3D"a" style=3D"font-size: 12px; background-color: #dfd;" bgcolor=3D"#d= fd">=0A<td class=3D"ln" style=3D"font-size: 12px; color: #000; font-family:= 'Bitstream Vera Sans Mono','Monaco','Courier',monospace; width: 23px; text= -align: right; background-color: #ccc;" align=3D"right" bgcolor=3D"#ccc"></= td>=0A<td class=3D"ln" style=3D"font-size: 12px; color: #000; font-family: = 'Bitstream Vera Sans Mono','Monaco','Courier',monospace; width: 23px; text-= align: right; background-color: #ccc;" align=3D"right" bgcolor=3D"#ccc">19<= /td>=0A<td style=3D"font-size: 12px; color: #000; font-family: 'Bitstream V= era Sans Mono','Monaco','Courier',monospace;">=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0currentDeployingModule.remove();</td>=0A</tr>=0A= <tr style=3D"font-size: 12px;">=0A<td class=3D"ln" style=3D"font-size: 12px= ; color: #000; font-family: 'Bitstream Vera Sans Mono','Monaco','Courier',m= onospace; width: 23px; text-align: right; background-color: #ccc;" align=3D= "right" bgcolor=3D"#ccc">21</td>=0A<td class=3D"ln" style=3D"font-size: 12p= x; color: #000; font-family: 'Bitstream Vera Sans Mono','Monaco','Courier',= monospace; width: 23px; text-align: right; background-color: #ccc;" align= =3D"right" bgcolor=3D"#ccc">20</td>=0A<td style=3D"font-size: 12px; color: = #000; font-family: 'Bitstream Vera Sans Mono','Monaco','Courier',monospace;= ">=C2=A0=C2=A0=C2=A0=C2=A0}</td>=0A</tr>=0A<tr style=3D"font-size: 12px;">= =0A<td class=3D"ln" style=3D"font-size: 12px; color: #000; font-family: 'Bi= tstream Vera Sans Mono','Monaco','Courier',monospace; width: 23px; text-ali= gn: right; background-color: #ccc;" align=3D"right" bgcolor=3D"#ccc">22</td= >=0A<td class=3D"ln" style=3D"font-size: 12px; color: #000; font-family: 'B= itstream Vera Sans Mono','Monaco','Courier',monospace; width: 23px; text-al= ign: right; background-color: #ccc;" align=3D"right" bgcolor=3D"#ccc">21</t= d>=0A<td style=3D"font-size: 12px; color: #000; font-family: 'Bitstream Ver= a Sans Mono','Monaco','Courier',monospace;">=C2=A0=C2=A0=C2=A0=C2=A0</td>= =0A</tr>=0A<tr style=3D"font-size: 12px;">=0A<td class=3D"ln" style=3D"font= -size: 12px; color: #000; font-family: 'Bitstream Vera Sans Mono','Monaco',= 'Courier',monospace; width: 23px; text-align: right; background-color: #ccc= ;" align=3D"right" bgcolor=3D"#ccc">23</td>=0A<td class=3D"ln" style=3D"fon= t-size: 12px; color: #000; font-family: 'Bitstream Vera Sans Mono','Monaco'= ,'Courier',monospace; width: 23px; text-align: right; background-color: #cc= c;" align=3D"right" bgcolor=3D"#ccc">22</td>=0A<td style=3D"font-size: 12px= ; color: #000; font-family: 'Bitstream Vera Sans Mono','Monaco','Courier',m= onospace;">=C2=A0=C2=A0=C2=A0=C2=A0public=C2=A0static=C2=A0PicoModuleSystem= SPI=C2=A0getDeployingModuleSystem()=C2=A0{</td>=0A</tr>=0A</table>=0A<h2 id= =3D"modules/picocontainer-modules/src/main/java/com/picocontainer/modules/d= eployer/ModuleLayout.java" style=3D"font-size: 12px; font-family: Verdana; = font-weight: bold; line-height: 25px; margin-bottom: 2px; padding-left: 5px= ; background-color: #bbb;">Changed file modules/picocontainer-modules/src/m= ain/java/com/picocontainer/modules/deployer/ModuleLayout.java</h2>=0A=0A<ta= ble style=3D"font-size: 12px; width: 100%; border-collapse: collapse;">=0A<= tr style=3D"font-size: 12px;">=0A<td class=3D"ln" style=3D"font-size: 12px;= color: #000; font-family: 'Bitstream Vera Sans Mono','Monaco','Courier',mo= nospace; width: 23px; text-align: right; background-color: #ccc;" align=3D"= right" bgcolor=3D"#ccc">49</td>=0A<td class=3D"ln" style=3D"font-size: 12px= ; color: #000; font-family: 'Bitstream Vera Sans Mono','Monaco','Courier',m= onospace; width: 23px; text-align: right; background-color: #ccc;" align=3D= "right" bgcolor=3D"#ccc">49</td>=0A<td style=3D"font-size: 12px; color: #00= 0; font-family: 'Bitstream Vera Sans Mono','Monaco','Courier',monospace;">= =C2=A0=C2=A0=C2=A0=C2=A0FileExtensionMapper=C2=A0getFileExtensionMapper();<= /td>=0A</tr>=0A<tr style=3D"font-size: 12px;">=0A<td class=3D"ln" style=3D"= font-size: 12px; color: #000; font-family: 'Bitstream Vera Sans Mono','Mona= co','Courier',monospace; width: 23px; text-align: right; background-color: = #ccc;" align=3D"right" bgcolor=3D"#ccc">50</td>=0A<td class=3D"ln" style=3D= "font-size: 12px; color: #000; font-family: 'Bitstream Vera Sans Mono','Mon= aco','Courier',monospace; width: 23px; text-align: right; background-color:= #ccc;" align=3D"right" bgcolor=3D"#ccc">50</td>=0A<td style=3D"font-size: = 12px; color: #000; font-family: 'Bitstream Vera Sans Mono','Monaco','Courie= r',monospace;">=C2=A0</td>=0A</tr>=0A<tr style=3D"font-size: 12px;">=0A<td = class=3D"ln" style=3D"font-size: 12px; color: #000; font-family: 'Bitstream= Vera Sans Mono','Monaco','Courier',monospace; width: 23px; text-align: rig= ht; background-color: #ccc;" align=3D"right" bgcolor=3D"#ccc">51</td>=0A<td= class=3D"ln" style=3D"font-size: 12px; color: #000; font-family: 'Bitstrea= m Vera Sans Mono','Monaco','Courier',monospace; width: 23px; text-align: ri= ght; background-color: #ccc;" align=3D"right" bgcolor=3D"#ccc">51</td>=0A<t= d style=3D"font-size: 12px; color: #000; font-family: 'Bitstream Vera Sans = Mono','Monaco','Courier',monospace;">=C2=A0=C2=A0=C2=A0=C2=A0/**</td>=0A</t= r>=0A<tr class=3D"r" style=3D"font-size: 12px; background-color: #fdd;" bgc= olor=3D"#fdd">=0A<td class=3D"ln" style=3D"font-size: 12px; color: #000; fo= nt-family: 'Bitstream Vera Sans Mono','Monaco','Courier',monospace; width: = 23px; text-align: right; background-color: #ccc;" align=3D"right" bgcolor= =3D"#ccc">52</td>=0A<td class=3D"ln" style=3D"font-size: 12px; color: #000;= font-family: 'Bitstream Vera Sans Mono','Monaco','Courier',monospace; widt= h: 23px; text-align: right; background-color: #ccc;" align=3D"right" bgcolo= r=3D"#ccc"></td>=0A<td style=3D"font-size: 12px; color: #000; font-family: = 'Bitstream Vera Sans Mono','Monaco','Courier',monospace;">=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0*=C2=A0Retrieve=C2=A0the=C2=A0<span class=3D"rr" style= =3D"font-size: 12px; background-color: #faa;">espected</span>=C2=A0&quo= t;base=C2=A0name&quot;=C2=A0for=C2=A0scripts.=C2=A0For=C2=A0example,=C2= =A0if</td>=0A</tr>=0A<tr class=3D"a" style=3D"font-size: 12px; background-c= olor: #dfd;" bgcolor=3D"#dfd">=0A<td class=3D"ln" style=3D"font-size: 12px;= color: #000; font-family: 'Bitstream Vera Sans Mono','Monaco','Courier',mo= nospace; width: 23px; text-align: right; background-color: #ccc;" align=3D"= right" bgcolor=3D"#ccc"></td>=0A<td class=3D"ln" style=3D"font-size: 12px; = color: #000; font-family: 'Bitstream Vera Sans Mono','Monaco','Courier',mon= ospace; width: 23px; text-align: right; background-color: #ccc;" align=3D"r= ight" bgcolor=3D"#ccc">52</td>=0A<td style=3D"font-size: 12px; color: #000;= font-family: 'Bitstream Vera Sans Mono','Monaco','Courier',monospace;">=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0*=C2=A0Retrieve=C2=A0the=C2=A0<span class= =3D"aa" style=3D"font-size: 12px; background-color: #afa;">expected</span>= =C2=A0&quot;base=C2=A0name&quot;=C2=A0for=C2=A0scripts.=C2=A0For=C2= =A0example,=C2=A0if</td>=0A</tr>=0A<tr style=3D"font-size: 12px;">=0A<td cl= ass=3D"ln" style=3D"font-size: 12px; color: #000; font-family: 'Bitstream V= era Sans Mono','Monaco','Courier',monospace; width: 23px; text-align: right= ; background-color: #ccc;" align=3D"right" bgcolor=3D"#ccc">53</td>=0A<td c= lass=3D"ln" style=3D"font-size: 12px; color: #000; font-family: 'Bitstream = Vera Sans Mono','Monaco','Courier',monospace; width: 23px; text-align: righ= t; background-color: #ccc;" align=3D"right" bgcolor=3D"#ccc">53</td>=0A<td = style=3D"font-size: 12px; color: #000; font-family: 'Bitstream Vera Sans Mo= no','Monaco','Courier',monospace;">=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0*=C2=A0the= =C2=A0base=C2=A0name=C2=A0is=C2=A0&quot;picocontainer&quot;,=C2=A0t= hen=C2=A0the=C2=A0deployment=C2=A0script</td>=0A</tr>=0A<tr style=3D"font-s= ize: 12px;">=0A<td class=3D"ln" style=3D"font-size: 12px; color: #000; font= -family: 'Bitstream Vera Sans Mono','Monaco','Courier',monospace; width: 23= px; text-align: right; background-color: #ccc;" align=3D"right" bgcolor=3D"= #ccc">54</td>=0A<td class=3D"ln" style=3D"font-size: 12px; color: #000; fon= t-family: 'Bitstream Vera Sans Mono','Monaco','Courier',monospace; width: 2= 3px; text-align: right; background-color: #ccc;" align=3D"right" bgcolor=3D= "#ccc">54</td>=0A<td style=3D"font-size: 12px; color: #000; font-family: 'B= itstream Vera Sans Mono','Monaco','Courier',monospace;">=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0*=C2=A0will=C2=A0be=C2=A0(for=C2=A0example):=C2=A0&quot;pic= ocontainer.js&quot;,=C2=A0or</td>=0A</tr>=0A<tr style=3D"font-size: 12p= x;">=0A<td class=3D"ln" style=3D"font-size: 12px; color: #000; font-family:= 'Bitstream Vera Sans Mono','Monaco','Courier',monospace; width: 23px; text= -align: right; background-color: #ccc;" align=3D"right" bgcolor=3D"#ccc">55= </td>=0A<td class=3D"ln" style=3D"font-size: 12px; color: #000; font-family= : 'Bitstream Vera Sans Mono','Monaco','Courier',monospace; width: 23px; tex= t-align: right; background-color: #ccc;" align=3D"right" bgcolor=3D"#ccc">5= 5</td>=0A<td style=3D"font-size: 12px; color: #000; font-family: 'Bitstream= Vera Sans Mono','Monaco','Courier',monospace;">=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0*=C2=A0&quot;picocontainer.groovy&quot;</td>=0A</tr>=0A</table>= =0A<br style=3D"font-size: 12px;"><br style=3D"font-size: 12px;">=0A</body>= =0A</html>=0A= --a65d909d702eacfba735bee18121b3ede9c8abd4--