From 6d8859f6f66f1090a3e55443dd2bf27688faa6bf Mon Sep 17 00:00:00 2001 From: SteffenBrauns <56578627+SteffenBrauns@users.noreply.github.com> Date: Mon, 22 May 2023 16:44:59 +0200 Subject: [PATCH] Bugfix NPE in ClientAssociation#close() Added null check for reportListener --- .../iec61850bean/ClientAssociation.java | 20 ++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/src/main/java/com/beanit/iec61850bean/ClientAssociation.java b/src/main/java/com/beanit/iec61850bean/ClientAssociation.java index e7dc04a..866ae46 100644 --- a/src/main/java/com/beanit/iec61850bean/ClientAssociation.java +++ b/src/main/java/com/beanit/iec61850bean/ClientAssociation.java @@ -2110,15 +2110,17 @@ public final class ClientAssociation { closed = true; acseAssociation.close(); lastIOException = e; - Thread t1 = - new Thread( - new Runnable() { - @Override - public void run() { - reportListener.associationClosed(lastIOException); - } - }); - t1.start(); + if (reportListener != null) { + Thread t1 = + new Thread( + new Runnable() { + @Override + public void run() { + reportListener.associationClosed(lastIOException); + } + }); + t1.start(); + } MMSpdu mmsPdu = new MMSpdu(); mmsPdu.setConfirmedRequestPDU(new ConfirmedRequestPDU());