From 6f403f3dd88590d47cf3eb789631d6c225b683df Mon Sep 17 00:00:00 2001
From: Dominique Marcadet <Dominique.Marcadet@centralesupelec.fr>
Date: Tue, 7 May 2019 15:52:39 +0200
Subject: [PATCH] avoid possible NPE
---
.../scl/validator/nsd/NsdEObjectValidator.java | 14 ++++++++++----
1 file changed, 10 insertions(+), 4 deletions(-)
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.tools/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/validator/nsd/NsdEObjectValidator.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl.tools/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/validator/nsd/NsdEObjectValidator.java
index 8820de5..5642274 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl.tools/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/validator/nsd/NsdEObjectValidator.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl.tools/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/validator/nsd/NsdEObjectValidator.java
@@ -47,19 +47,25 @@ public class NsdEObjectValidator implements EValidator {
}
public void initializeValidationData() {
- this.anyLNValidatorMap = this.nsdResourceSet.getLNClassStream()
+ this.anyLNValidatorMap =
+ nsdResourceSet
+ .getLNClassStream()
.map( lnClass -> generateAnyLNValidators( lnClass ) )
.reduce( ( a, b ) -> {
a.putAll( b );
return a;
- } ).get();
+ } )
+ .orElse( new HashMap<>() );
- this.lNodeTypeValidatorMap = this.nsdResourceSet.getLNClassStream()
+ this.lNodeTypeValidatorMap =
+ nsdResourceSet
+ .getLNClassStream()
.map( lnClass -> generateLNodeTypeValidators( lnClass ) )
.reduce( ( a, b ) -> {
a.putAll( b );
return a;
- } ).get();
+ } )
+ .orElse( new HashMap<>() );
}
private HashMap< String, AnyLNValidator > generateAnyLNValidators( LNClass lnClass ) {
--
GitLab