1 files changed, 8 insertions, 1 deletions
diff --git a/id.server/src/at/gv/egovernment/moa/id/config/ConfigurationBuilder.java b/id.server/src/at/gv/egovernment/moa/id/config/ConfigurationBuilder.java
index ebb29c26d..43c018e76 100644
--- a/id.server/src/at/gv/egovernment/moa/id/config/ConfigurationBuilder.java
+++ b/id.server/src/at/gv/egovernment/moa/id/config/ConfigurationBuilder.java
@@ -472,7 +472,14 @@ public class ConfigurationBuilder {
           Logger.error("Missing \"IdentificationNumber\" for OA of type \"businessService\"");
           throw new ConfigurationException("config.02", null);
         }
-        oap.setIdentityLinkDomainIdentifier(buildIdentityLinkDomainIdentifier(identificationNumberChild));
+        if ("false".equalsIgnoreCase(oAElem.getAttribute("calculateHPI"))) {
+        	oap.setIdentityLinkDomainIdentifier(buildIdentityLinkDomainIdentifier(identificationNumberChild));
+        } else {
+        	// If we have business service and want to dealt with GDA, the security layer can be advised to calulate 
+        	// the Health Professional Identifier HPI instead of the wbPK
+            Logger.info("OA uses HPI for Identification");
+        	oap.setIdentityLinkDomainIdentifier(Constants.URN_PREFIX_HPI);
+        }
         
         // if OA type is "businessSErvice" set slVersion to 1.2 and ignore parameter in config file
         Logger.info("OA type is \"businessService\"; setting Security Layer version to 1.2");