Skip to content

Commit

Permalink
Post merge
Browse files Browse the repository at this point in the history
Signed-off-by: Maxim Nesen <[email protected]>
  • Loading branch information
senivam committed Jul 23, 2024
1 parent 2ece961 commit 991e08b
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 18 deletions.
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2023 Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2023, 2024 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0, which is available at
Expand Down Expand Up @@ -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
Expand Down
10 changes: 0 additions & 10 deletions core-server/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion examples/osgi-http-service/functional-test/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
5 changes: 0 additions & 5 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down

0 comments on commit 991e08b

Please sign in to comment.