honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Improve closing mock webserver when failed to start (#52943) 

Fix NPE when closing a webserver that hasn't started correctly.

This can happen when ssl context isn't initialized. The server instance is then never set,
which causes an NPE that masks the actual failure.

Example stacktrace that would mask an actual failure:

```
java.lang.NullPointerException
	at org.elasticsearch.test.http.MockWebServer.close(MockWebServer.java:271)
	at org.elasticsearch.xpack.watcher.test.integration.HttpSecretsIntegrationTests.cleanup(HttpSecretsIntegrationTests.java:70)
	at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
	at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
	at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
	at java.lang.reflect.Method.invoke(Method.java:498)
```
This commit is contained in:
Martijn van Groningen 2020-03-02 07:16:34 +01:00
parent 712191f2af
commit d102158e6f
No known key found for this signature in database
GPG Key ID: AB236F4FCF2AF12A
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
x-pack/plugin/core/src/test/java/org/elasticsearch/test/http/MockWebServer.java
View File

@ -268,10 +268,12 @@ public class MockWebServer implements Closeable {
logger.debug("[{}:{}] Counting down all latches before terminating executor", getHostName(), getPort()); logger.debug("[{}:{}] Counting down all latches before terminating executor", getHostName(), getPort());
latches.forEach(CountDownLatch::countDown); latches.forEach(CountDownLatch::countDown);
if (server.getExecutor() instanceof ExecutorService) { if (server != null) {
terminate((ExecutorService) server.getExecutor()); if (server.getExecutor() instanceof ExecutorService) {
terminate((ExecutorService) server.getExecutor());
}
server.stop(0);
} }
server.stop(0);
} }
/** /**

4
x-pack/plugin/watcher/src/test/java/org/elasticsearch/xpack/watcher/actions/webhook/WebhookHttpsIntegrationTests.java
View File

@ -72,7 +72,9 @@ public class WebhookHttpsIntegrationTests extends AbstractWatcherIntegrationTest
@After @After
public void stopWebservice() throws Exception { public void stopWebservice() throws Exception {
webServer.close(); if (webServer != null) {
webServer.close();
}
} }
public void testHttps() throws Exception { public void testHttps() throws Exception {