Merge pull request #35 from SteffenBrauns/patch-1

Bugfix NPE in ClientAssociation#close()
2 years ago · 0508da4073
parent f9f34cde0c 6d8859f6f6
commit 0508da4073
1 changed files with 11 additions and 9 deletions
--- 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());