From 709b51007eddad8520a265c24fb5f4bff923b022 Mon Sep 17 00:00:00 2001 From: Michael Vorburger Date: Mon, 6 Nov 2017 17:41:26 +0100 Subject: [PATCH 1/1] Fix ResourceBatchingManager NPE seen in ElanServiceTest to avoid this problem which occasionally fails ElanServiceTest: org.opendaylight.genius.datastoreutils.testutils.infra.AutoCloseableRuntimeException: Failed to close() class org.opendaylight.genius.interfacemanager.renderer.ovs.utilities.BatchingUtils (...) Caused by: java.lang.NullPointerException 10:59:34 at org.opendaylight.genius.utils.batching.ResourceBatchingManager.deregisterBatchableResource(ResourceBatchingManager.java:215) Change-Id: I68d6fc5ec03e6f59e111e66659f0f0e1187511ca Signed-off-by: Michael Vorburger --- .../genius/utils/batching/ResourceBatchingManager.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/mdsalutil/mdsalutil-api/src/main/java/org/opendaylight/genius/utils/batching/ResourceBatchingManager.java b/mdsalutil/mdsalutil-api/src/main/java/org/opendaylight/genius/utils/batching/ResourceBatchingManager.java index b5c944604..7625c7b4e 100644 --- a/mdsalutil/mdsalutil-api/src/main/java/org/opendaylight/genius/utils/batching/ResourceBatchingManager.java +++ b/mdsalutil/mdsalutil-api/src/main/java/org/opendaylight/genius/utils/batching/ResourceBatchingManager.java @@ -212,7 +212,9 @@ public class ResourceBatchingManager implements AutoCloseable { resourceHandlerMapper.remove(resourceType); resourceBatchingThreadMapper.remove(resourceType); ScheduledThreadPoolExecutor scheduledThreadPoolExecutor = resourceBatchingThreadMapper.get(resourceType); - scheduledThreadPoolExecutor.shutdown(); + if (scheduledThreadPoolExecutor != null) { + scheduledThreadPoolExecutor.shutdown(); + } } private class Batcher implements Runnable { -- 2.36.6