flasn4nt
/
grpc-java
mirror of https://github.com/grpc/grpc-java.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

okhttp: Ignore known conscrypt socket close issue (#10811) 

This stops an exception from being thrown when a known Conscrypt synchronization issue happens.
This commit is contained in:
Terry Wilson 2024-01-10 11:01:42 -08:00 committed by GitHub
parent 516f411e02
commit 6605649c28
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
okhttp/src/main/java/io/grpc/okhttp/OkHttpClientTransport.java
View File

@ -1098,6 +1098,7 @@ class OkHttpClientTransport implements ConnectionClientTransport, TransportExcep
} }
@Override @Override
@SuppressWarnings("Finally")
public void run() { public void run() {
String threadName = Thread.currentThread().getName(); String threadName = Thread.currentThread().getName();
Thread.currentThread().setName("OkHttpClientTransport"); Thread.currentThread().setName("OkHttpClientTransport");
@ -1130,6 +1131,15 @@ class OkHttpClientTransport implements ConnectionClientTransport, TransportExcep
frameReader.close(); frameReader.close();
} catch (IOException ex) { } catch (IOException ex) {
log.log(Level.INFO, "Exception closing frame reader", ex); log.log(Level.INFO, "Exception closing frame reader", ex);
} catch (RuntimeException e) {
// This same check is done in okhttp proper:
// https://github.com/square/okhttp/blob/3cc0f4917cbda03cb31617f8ead1e0aeb19de2fb/okhttp/src/main/kotlin/okhttp3/internal/-UtilJvm.kt#L270
// Conscrypt in Android 10 and 11 may throw closing an SSLSocket. This is safe to ignore.
// https://issuetracker.google.com/issues/177450597
if (!"bio == null".equals(e.getMessage())) {
throw e;
}
} }
listener.transportTerminated(); listener.transportTerminated();
Thread.currentThread().setName(threadName); Thread.currentThread().setName(threadName);