ASF Bugzilla – Attachment 33832 Details for
Bug 59449
org.apache.catalina.core.ContainerBase#removeChild remove order
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
patch to implement the proposed behaviour.
patch_against_trunk.patch (text/plain), 1.23 KB, created by
Huxing Zhang
on 2016-05-10 06:02:59 UTC
(
hide
)
Description:
patch to implement the proposed behaviour.
Filename:
MIME Type:
Creator:
Huxing Zhang
Created:
2016-05-10 06:02:59 UTC
Size:
1.23 KB
patch
obsolete
>Index: java/org/apache/catalina/core/ContainerBase.java >=================================================================== >--- java/org/apache/catalina/core/ContainerBase.java (revision 1743100) >+++ java/org/apache/catalina/core/ContainerBase.java (working copy) >@@ -810,12 +810,6 @@ > return; > } > >- synchronized(children) { >- if (children.get(child.getName()) == null) >- return; >- children.remove(child.getName()); >- } >- > try { > if (child.getState().isAvailable()) { > child.stop(); >@@ -824,8 +818,6 @@ > log.error("ContainerBase.removeChild: stop: ", e); > } > >- fireContainerEvent(REMOVE_CHILD_EVENT, child); >- > try { > // child.destroy() may have already been called which would have > // triggered this call. If that is the case, no need to destroy the >@@ -837,6 +829,13 @@ > log.error("ContainerBase.removeChild: destroy: ", e); > } > >+ synchronized(children) { >+ if (children.get(child.getName()) == null) >+ return; >+ children.remove(child.getName()); >+ } >+ >+ fireContainerEvent(REMOVE_CHILD_EVENT, child); > } > >
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 59449
: 33832