1 files changed, 10 insertions, 17 deletions
diff --git a/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/dao/SimpleEidasData.java b/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/dao/SimpleEidasData.java
index 674f5b48..57597122 100644
--- a/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/dao/SimpleEidasData.java
+++ b/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/dao/SimpleEidasData.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 A-SIT Plus GmbH
+ * Copyright 2020 A-SIT Plus GmbH
  * AT-specific eIDAS Connector has been developed in a cooperation between EGIZ,
  * A-SIT Plus GmbH, A-SIT, and Graz University of Technology.
  *
@@ -30,18 +30,18 @@ import lombok.Data;
 @Data
 public class SimpleEidasData {
 
-  private String citizenCountryCode = null;
+  private String citizenCountryCode;
 
   // MDS
-  private String pseudonym = null;
-  private String givenName = null;
-  private String familyName = null;
-  private String dateOfBirth = null;
+  private String pseudonym;
+  private String givenName;
+  private String familyName;
+  private String dateOfBirth;
 
   // additional attributes
-  private String placeOfBirth = null;
-  private String birthName = null;
-  private PostalAddressType address = null;
+  private String placeOfBirth;
+  private String birthName;
+  private PostalAddressType address;
   private String taxNumber;
 
   /**
@@ -51,14 +51,7 @@ public class SimpleEidasData {
    * @throws WorkflowException if multiple results have been found
    */
   public boolean equalsRegisterData(MergedRegisterSearchResult result) throws WorkflowException {
-    if (result.getResultCount() != 1) {
-      throw new WorkflowException("result.getResultCount() != 1");
-    }
-    if (result.getResultsErnb().size() == 1) {
-      return equalsRegisterData(result.getResultsErnb().get(0));
-    } else {
-      return equalsRegisterData(result.getResultsZmr().get(0));
-    }
+    return equalsRegisterData(result.getResult());
   }
 
   private boolean equalsRegisterData(RegisterResult result) {