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 8820de5ddec383c4f27ac837dd1779bc52c06080..564227462b728cbd7cc05d935748a2c9790fca1c 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 ) {