Issue #11220 - changes from review

jetty · Jan 24, 2024 · fc32100 · fc32100
1 parent d92230d
commit fc32100
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/Handler.java b/jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/Handler.java
@@ -693,16 +693,23 @@ public Wrapper(boolean dynamic, Handler handler)
         {
             super(dynamic);
             _handler = handler;
-            addBean(handler);
         }
 
         @Override
         protected void doStart() throws Exception
         {
+            addBean(_handler);
             Singleton.updateHandler(this, _handler);
             super.doStart();
         }
 
+        @Override
+        protected void doStop() throws Exception
+        {
+            super.doStop();
+            removeBean(_handler);
+        }
+
         @Override
         public Handler getHandler()
         {

diff --git a/jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/handler/ContextHandler.java b/jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/handler/ContextHandler.java
@@ -1040,7 +1040,8 @@ public String toString()
             b.append(getDisplayName()).append(',');
         b.append(getContextPath());
         b.append(",b=").append(getBaseResource());
-        b.append(",a=").append(_availability.get());
+        b.append(",a=");
+        b.append(",a=").append(_availability);
 
         if (vhosts != null && !vhosts.isEmpty())
         {