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 <vorburger@redhat.com>

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 b5c944604ce1c5c1468c7d2943894dcddbdfb723..7625c7b4ee49de872cd21a096b1aa86579d18b9a 100644 (file)
--- 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 {