[picocontainer-scm] [scm-git][3/6] Fix for PICO-329.
Michael Rimov <git-yCVjj/[email protected]> Wed, 19 Jun 2013 02:18:55 -0500 (CDT)
| Newsgroups | gmane.comp.java.picocontainer.cvs |
|---|---|
| Message-ID | <[email protected]> |
--61f89bea5cc1f9b9438716426a551a947562c1c0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Content-Disposition: inline commit 44c76abe7f3111763f4dd9fcf1f3e446d34d3dbe=0AAuthor: Michael Rimov= <[email protected]>=0AAuthorDate: Tue, 18 Jun 2013 01:22:29 -0700= =0ACommit: Michael Rimov <[email protected]>=0ACommitDate: Tue,= 18 Jun 2013 01:22:29 -0700=0A=0A Fix for PICO-329.=0A=0Adiff --git a/we= b/web-core/src/java/org/picocontainer/web/PicoServletContainerListener.java= b/web/web-core/src/java/org/picocontainer/web/PicoServletContainerListener= .java=0Aindex 4ba7b65..d92851f 100644=0A--- a/web/web-core/src/java/org/pic= ocontainer/web/PicoServletContainerListener.java=0A+++ b/web/web-core/src/j= ava/org/picocontainer/web/PicoServletContainerListener.java=0A@@ -207,9 +20= 7,11 @@ public class PicoServletContainerListener implements ServletContext= Listener, Htt=0A =0A public void contextDestroyed(ServletContextEvent e= vent) {=0A ScopedContainers scopedContainers =3D getScopedContainer= s(event.getServletContext());=0A+ if (scopedContainers !=3D null && = scopedContainers.getApplicationContainer() !=3D null) {=0A stop(sc= opedContainers.getApplicationContainer());=0A dispose(scopedContai= ners.getApplicationContainer());=0A }=0A+ }=0A =0A private v= oid start(MutablePicoContainer container) {=0A container.start();= =0A=0A=0A=0A= --61f89bea5cc1f9b9438716426a551a947562c1c0 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;">44c76abe7f31117= 63f4dd9fcf1f3e446d34d3dbe</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;">Tue, 18 Jun 2013 01:22:29 -0700</dd>=0A<dt style=3D"f= ont-size: 12px; float: left; font-weight: bold; min-width: 6em;">Message</d= t>=0A<dd class=3D"" style=3D"font-size: 12px;">Fix for PICO-329.</dd>=0A</d= l>=0A<h2 id=3D"web/web-core/src/java/org/picocontainer/web/PicoServletConta= inerListener.java" style=3D"font-size: 12px; font-family: Verdana; font-wei= ght: bold; line-height: 25px; margin-bottom: 2px; padding-left: 5px; backgr= ound-color: #bbb;">Changed file web/web-core/src/java/org/picocontainer/web= /PicoServletContainerListener.java</h2>=0A=0A<table style=3D"font-size: 12p= x; 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',monospace; width: 23px; text-= align: right; background-color: #ccc;" align=3D"right" bgcolor=3D"#ccc">207= </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">2= 07</td>=0A<td style=3D"font-size: 12px; color: #000; font-family: 'Bitstrea= m Vera Sans Mono','Monaco','Courier',monospace;">=C2=A0</td>=0A</tr>=0A<tr = style=3D"font-size: 12px;">=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">208</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">208</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=A0public=C2=A0void=C2=A0contextDestroyed(Servle= tContextEvent=C2=A0event)=C2=A0{</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">20= 9</td>=0A<td class=3D"ln" style=3D"font-size: 12px; color: #000; font-famil= y: 'Bitstream Vera Sans Mono','Monaco','Courier',monospace; width: 23px; te= xt-align: right; background-color: #ccc;" align=3D"right" bgcolor=3D"#ccc">= 209</td>=0A<td style=3D"font-size: 12px; color: #000; font-family: 'Bitstre= am Vera Sans Mono','Monaco','Courier',monospace;">=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0ScopedContainers=C2=A0scopedContainers=C2=A0= =3D=C2=A0getScopedContainers(event.getServletContext());</td>=0A</tr>=0A<tr= class=3D"a" style=3D"font-size: 12px; background-color: #dfd;" bgcolor=3D"= #dfd">=0A<td class=3D"ln" style=3D"font-size: 12px; color: #000; font-famil= y: 'Bitstream Vera Sans Mono','Monaco','Courier',monospace; width: 23px; te= xt-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; tex= t-align: right; background-color: #ccc;" align=3D"right" bgcolor=3D"#ccc">2= 10</td>=0A<td style=3D"font-size: 12px; color: #000; font-family: 'Bitstrea= m Vera Sans Mono','Monaco','Courier',monospace;">=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0if=C2=A0(scopedContainers=C2=A0!=3D=C2=A0null= =C2=A0&&=C2=A0scopedContainers.getApplicationContainer()=C2=A0!=3D= =C2=A0null)=C2=A0{</td>=0A</tr>=0A<tr style=3D"font-size: 12px;">=0A<td cla= ss=3D"ln" style=3D"font-size: 12px; color: #000; font-family: 'Bitstream Ve= ra Sans Mono','Monaco','Courier',monospace; width: 23px; text-align: right;= background-color: #ccc;" align=3D"right" bgcolor=3D"#ccc">210</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">211</td>=0A<td= style=3D"font-size: 12px; color: #000; font-family: 'Bitstream Vera Sans M= ono','Monaco','Courier',monospace;">=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0stop(scopedContainers.getApplicationContai= ner());</td>=0A</tr>=0A<tr style=3D"font-size: 12px;">=0A<td class=3D"ln" s= tyle=3D"font-size: 12px; color: #000; font-family: 'Bitstream Vera Sans Mon= o','Monaco','Courier',monospace; width: 23px; text-align: right; background= -color: #ccc;" align=3D"right" bgcolor=3D"#ccc">211</td>=0A<td class=3D"ln"= style=3D"font-size: 12px; color: #000; font-family: 'Bitstream Vera Sans M= ono','Monaco','Courier',monospace; width: 23px; text-align: right; backgrou= nd-color: #ccc;" align=3D"right" bgcolor=3D"#ccc">212</td>=0A<td style=3D"f= ont-size: 12px; color: #000; font-family: 'Bitstream Vera Sans Mono','Monac= o','Courier',monospace;">=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0dispose(scopedContainers.getApplicationContainer())= ;</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-col= or: #ccc;" align=3D"right" bgcolor=3D"#ccc">212</td>=0A<td class=3D"ln" sty= le=3D"font-size: 12px; color: #000; font-family: 'Bitstream Vera Sans Mono'= ,'Monaco','Courier',monospace; width: 23px; text-align: right; background-c= olor: #ccc;" align=3D"right" bgcolor=3D"#ccc">213</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=A0= }</td>=0A</tr>=0A<tr class=3D"a" style=3D"font-size: 12px; background-color= : #dfd;" bgcolor=3D"#dfd">=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"></td>=0A<td class=3D"ln" style=3D"font-size: 12px; colo= r: #000; font-family: 'Bitstream Vera Sans Mono','Monaco','Courier',monospa= ce; width: 23px; text-align: right; background-color: #ccc;" align=3D"right= " bgcolor=3D"#ccc">214</td>=0A<td style=3D"font-size: 12px; color: #000; fo= nt-family: 'Bitstream Vera Sans Mono','Monaco','Courier',monospace;">=C2=A0= =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: 'Bitst= ream Vera Sans Mono','Monaco','Courier',monospace; width: 23px; text-align:= right; background-color: #ccc;" align=3D"right" bgcolor=3D"#ccc">213</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">215</t= d>=0A<td style=3D"font-size: 12px; color: #000; font-family: 'Bitstream Ver= a Sans Mono','Monaco','Courier',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: right; background-color: #ccc;" align=3D"right" b= gcolor=3D"#ccc">214</td>=0A<td class=3D"ln" style=3D"font-size: 12px; color= : #000; font-family: 'Bitstream Vera Sans Mono','Monaco','Courier',monospac= e; width: 23px; text-align: right; background-color: #ccc;" align=3D"right"= bgcolor=3D"#ccc">216</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=A0private=C2=A0void=C2=A0start(MutablePicoContainer= =C2=A0container)=C2=A0{</td>=0A</tr>=0A<tr style=3D"font-size: 12px;">=0A<t= d class=3D"ln" style=3D"font-size: 12px; color: #000; font-family: 'Bitstre= am Vera Sans Mono','Monaco','Courier',monospace; width: 23px; text-align: r= ight; background-color: #ccc;" align=3D"right" bgcolor=3D"#ccc">215</td>=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">217</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=A0container.start();</td>=0A</tr>=0A</table>=0A<br style= =3D"font-size: 12px;"><br style=3D"font-size: 12px;">=0A</body>=0A</html>= =0A= --61f89bea5cc1f9b9438716426a551a947562c1c0--