From 1ec8450cdfce8d75914cc8191523c46edd42b635 Mon Sep 17 00:00:00 2001
From: Maxim Nesen <maxim.nesen@oracle.com>
Date: Tue, 23 Jul 2024 22:31:47 +0200
Subject: [PATCH] Post merge

Signed-off-by: Maxim Nesen <maxim.nesen@oracle.com>
---
 .../netty/connector/JerseyExpectContinueHandler.java   |  3 ++-
 core-server/pom.xml                                    | 10 ----------
 examples/osgi-http-service/functional-test/pom.xml     |  2 +-
 pom.xml                                                |  5 -----
 4 files changed, 3 insertions(+), 17 deletions(-)

diff --git a/connectors/netty-connector/src/main/java/org/glassfish/jersey/netty/connector/JerseyExpectContinueHandler.java b/connectors/netty-connector/src/main/java/org/glassfish/jersey/netty/connector/JerseyExpectContinueHandler.java
index 8bceac63ab..7d08af1565 100644
--- a/connectors/netty-connector/src/main/java/org/glassfish/jersey/netty/connector/JerseyExpectContinueHandler.java
+++ b/connectors/netty-connector/src/main/java/org/glassfish/jersey/netty/connector/JerseyExpectContinueHandler.java
@@ -59,7 +59,8 @@ public void channelRead(ChannelHandlerContext ctx, Object msg) throws Exception
                 ctx.pipeline().remove(JerseyExpectContinueHandler.class);
             }
         } else {
-            if (!isExpected) {
+            if (!isExpected
+                    && ctx.pipeline().context(JerseyExpectContinueHandler.class) != null) {
                 ctx.pipeline().remove(JerseyExpectContinueHandler.class);
             }
             ctx.fireChannelRead(msg); //bypass the message to the next handler in line
diff --git a/core-server/pom.xml b/core-server/pom.xml
index d10ebfc70c..7a09453285 100644
--- a/core-server/pom.xml
+++ b/core-server/pom.xml
@@ -258,16 +258,6 @@
     </dependencies>
 
     <profiles>
-        <profile>
-            <id>jdk8</id>
-            <activation>
-                <jdk>1.8</jdk>
-            </activation>
-            <properties>
-                <jboss.vfs.version>${jboss.vfs.jdk8.version}</jboss.vfs.version>
-                <jboss.logging.version>${jboss.logging.8.version}</jboss.logging.version>
-            </properties>
-        </profile>
         <profile>
             <id>securityOff</id>
             <properties>
diff --git a/examples/osgi-http-service/functional-test/pom.xml b/examples/osgi-http-service/functional-test/pom.xml
index 036f1d0b84..576fb1c599 100644
--- a/examples/osgi-http-service/functional-test/pom.xml
+++ b/examples/osgi-http-service/functional-test/pom.xml
@@ -145,7 +145,7 @@
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-log4j12</artifactId>
-            <version>2.0.13</version>
+            <version>${slf4j.version}</version>
             <scope>test</scope>
         </dependency>
 
diff --git a/pom.xml b/pom.xml
index ecbba8adb7..cdb20097cf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2163,13 +2163,8 @@
         <httpclient5.version>5.3.1</httpclient5.version>
         <jackson.version>2.17.1</jackson.version>
         <javassist.version>3.30.2-GA</javassist.version>
-        <jboss.logging.version>3.5.3.Final</jboss.logging.version>
-        <jboss.logging.8.version>3.4.3.Final</jboss.logging.8.version>
-        <jersey1.version>1.19.3</jersey1.version>
-        <jersey1.last.final.version>${jersey1.version}</jersey1.last.final.version>
         <jettison.version>1.3.7</jettison.version> <!-- TODO: 1.3.8 doesn't work; AbstractJsonTest complexBeanWithAttributes -->
         <jboss.vfs.version>3.3.2.Final</jboss.vfs.version>
-        <jboss.vfs.jdk8.version>3.2.17.Final</jboss.vfs.jdk8.version>
         <jboss.logging.version>3.6.0.Final</jboss.logging.version>
         <jmh.version>1.37</jmh.version>
         <jmockit.version>1.49</jmockit.version>