Attachment 26248 Details for Bug 50168 – Simple patch

[patch] Simple patch

50168.patch (text/plain), 2.01 KB, created by Ivan on 2010-11-01 22:11:16 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ivan

Created: 2010-11-01 22:11:16 UTC

Size: 2.01 KB

patch

obsolete

>Index: java/org/apache/catalina/connector/MapperListener.java
>===================================================================
>--- java/org/apache/catalina/connector/MapperListener.java	(revision 1029935)
>+++ java/org/apache/catalina/connector/MapperListener.java	(working copy)
>@@ -415,7 +415,7 @@
>             } else if (obj instanceof Host) {
>                 registerHost((Host) obj);
>             }
>-        } else if (event.getType() == Lifecycle.BEFORE_STOP_EVENT) {
>+        } else if (event.getType() == Lifecycle.AFTER_STOP_EVENT) {
>             Object obj = event.getSource();
>             if (obj instanceof Wrapper) {
>                 unregisterWrapper((Wrapper) obj);
>Index: java/org/apache/catalina/core/ContainerBase.java
>===================================================================
>--- java/org/apache/catalina/core/ContainerBase.java	(revision 1029935)
>+++ java/org/apache/catalina/core/ContainerBase.java	(working copy)
>@@ -940,11 +940,7 @@
>             return;
>         }
>         
>-        synchronized(children) {
>-            if (children.get(child.getName()) == null)
>-                return;
>-            children.remove(child.getName());
>-        }
>+        removeChildInternal(child);
>         
>         try {
>             if (child.getState().isAvailable()) {
>@@ -966,6 +962,13 @@
> 
>     }
> 
>+    protected void removeChildInternal(Container child) {
>+        synchronized(children) {
>+            if (children.get(child.getName()) == null)
>+                return;
>+            children.remove(child.getName());
>+        }
>+    }
> 
>     /**
>      * Remove a container event listener from this component.
>@@ -1102,7 +1105,11 @@
> 
>         // Required if the child is destroyed directly.
>         if (parent != null) {
>-            parent.removeChild(this);
>+            if (parent instanceof ContainerBase) {
>+                ((ContainerBase) parent).removeChildInternal(this);
>+            } else {
>+                parent.removeChild(this);
>+            }
>         }
> 
>         super.destroyInternal();

Actions: View | Diff

Attachments on bug 50168: 26248