Skip to content

Commit

Permalink
AsyncContext completion attempt after AsyncListener.onError is called e…
Browse files Browse the repository at this point in the history
…clipse-ee4j#5675

Signed-off-by: Jorge Bescos Gascon <[email protected]>
  • Loading branch information
jbescos committed Oct 29, 2024
1 parent ff5f5a8 commit f5fda1d
Show file tree
Hide file tree
Showing 2 changed files with 65 additions and 5 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -277,6 +277,14 @@ public void run() {
}
}

static boolean isIOException(Throwable t) {
boolean ioException = false;
while (t != null && !(ioException = t instanceof IOException)) {
t = t.getCause();
}
return ioException;
}

/**
* Get the Jersey server runtime background scheduler.
*
Expand Down Expand Up @@ -669,11 +677,18 @@ public OutputStream getOutputStream(final int contentLength) throws IOException

} catch (final Throwable ex) {
if (response.isCommitted()) {
/**
* We're done with processing here. There's nothing we can do about the exception so
* let's just log it.
*/
LOGGER.log(Level.SEVERE, LocalizationMessages.ERROR_WRITING_RESPONSE_ENTITY(), ex);
if (isIOException(ex)) {
skipFinally = true;
LOGGER.log(Level.WARNING, "Response was sent, but there is IO issue", ex);
// Connection is broken. Re-throw to the web container to remove the connection.
throw new MappableException("Response was sent, but there is IO issue", ex);
} else {
/**
* We're done with processing here. There's nothing we can do about the exception so
* let's just log it.
*/
LOGGER.log(Level.SEVERE, LocalizationMessages.ERROR_WRITING_RESPONSE_ENTITY(), ex);
}
} else {
skipFinally = true;
if (ex instanceof RuntimeException) {
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
/*
* Copyright (c) 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
* http://www.eclipse.org/legal/epl-2.0.
*
* This Source Code may also be made available under the following Secondary
* Licenses when the conditions for such availability set forth in the
* Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
* version 2 with the GNU Classpath Exception, which is available at
* https://www.gnu.org/software/classpath/license.html.
*
* SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
*/

package org.glassfish.jersey.server;

import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertTrue;

import java.io.IOException;

import org.junit.jupiter.api.Test;

public class ServerRuntimeTest {

@Test
public void ioExceptionInRoot() {
assertTrue(ServerRuntime.isIOException(new IOException()));
assertTrue(ServerRuntime.isIOException(new IOException(new RuntimeException())));
}

@Test
public void ioExceptionInCause() {
assertTrue(ServerRuntime.isIOException(new RuntimeException(new IOException())));
assertTrue(ServerRuntime.isIOException(new RuntimeException(new RuntimeException(new IOException()))));
}

@Test
public void noIOException() {
assertFalse(ServerRuntime.isIOException(new RuntimeException()));
assertFalse(ServerRuntime.isIOException(new RuntimeException(new RuntimeException())));
}
}

0 comments on commit f5fda1d

Please sign in to comment.