Skip to content

Commit 09b53c2

Browse files
removed SSL context Dead Code
1 parent dbc453f commit 09b53c2

2 files changed

Lines changed: 0 additions & 13 deletions

File tree

exporters/common/src/main/java/io/opentelemetry/exporter/internal/TlsConfigHelper.java

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -116,11 +116,6 @@ public X509TrustManager getEffectiveTrustManager() {
116116
if (trustManager != null) {
117117
return trustManager;
118118
}
119-
120-
if (sslContext != null) {
121-
return null;
122-
}
123-
124119
try {
125120
return TlsUtil.defaultTrustManager();
126121
} catch (SSLException e) {

exporters/common/src/test/java/io/opentelemetry/exporter/internal/TlsConfigHelperTest.java

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -108,14 +108,6 @@ void getEffectiveTrustManager_returnsDefaultTrustManager() {
108108
assertThat(helper.getEffectiveTrustManager()).isNotNull();
109109
}
110110

111-
@Test
112-
void getEffectiveTrustManager_returnsNullWhenSslContextConfigured() throws Exception {
113-
helper.setSslContext(
114-
SSLContext.getInstance("TLS"), TlsUtil.trustManager(serverTls.certificate().getEncoded()));
115-
116-
assertThat(helper.getEffectiveTrustManager()).isNull();
117-
}
118-
119111
@Test
120112
void getSslContext_usesDefaultTrustManagerWhenUnset() {
121113
assertThat(helper.getSslContext()).isNotNull();

0 commit comments

Comments
 (0)