fix bug in configtool regarding interfederation mode

3 files changed, 21 insertions, 21 deletions

diff --git a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/FormularCustomization.java b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/FormularCustomization.java
index b3f7c1f79..ca0bb8ac4 100644
--- a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/FormularCustomization.java
+++ b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/FormularCustomization.java
@@ -304,10 +304,10 @@ public class FormularCustomization implements IOnlineApplicationData {
         }
 		
         if (authoa.getMandates() != null && 
-        		(authoa.getMandates().getProfileName() != null 
+        		((authoa.getMandates().getProfileName() != null 
         		        &&  authoa.getMandates().getProfileName().size() > 0)
-        		  || MiscUtil.isNotEmpty(authoa.getMandates().getProfiles()))
-        	
+        		  || MiscUtil.isNotEmpty(authoa.getMandates().getProfiles())))
+        		
         	bkuselectioncustom.setMandateLoginButton(true);
         else
         	bkuselectioncustom.setMandateLoginButton(false);
diff --git a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/BasicOAAction.java b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/BasicOAAction.java
index 539deac9e..3d86ada31 100644
--- a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/BasicOAAction.java
+++ b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/BasicOAAction.java
@@ -512,17 +512,17 @@ public class BasicOAAction extends BasicAction {
 			} else {
 				//TODO: work-around for old config tool and new key/value configuration
 				//see: NewConfigurationDBRead.java Line 81
-				if (oa.getHjid() > 1000000) {
-					if (serviceIdentifier.equals(MOAIDConfigurationConstants.PREFIX_GATEWAY))						
-						oa.setHjid(oa.getHjid() - 1000000);
-					else if (serviceIdentifier.equals(MOAIDConfigurationConstants.PREFIX_IIDP))
-						oa.setHjid(oa.getHjid() - 2000000);
-					else if (serviceIdentifier.equals(MOAIDConfigurationConstants.PREFIX_VIDP))
-						oa.setHjid(oa.getHjid() - 3000000);
-					else
-						log.warn("Inconsistent state found! Service Identifier for OA found but Hjid is > 1000000.");
-					
-				}
+//				if (oa.getHjid() > 1000000) {
+//					if (serviceIdentifier.equals(MOAIDConfigurationConstants.PREFIX_GATEWAY))						
+//						oa.setHjid(oa.getHjid() - 1000000);
+//					else if (serviceIdentifier.equals(MOAIDConfigurationConstants.PREFIX_IIDP))
+//						oa.setHjid(oa.getHjid() - 2000000);
+//					else if (serviceIdentifier.equals(MOAIDConfigurationConstants.PREFIX_VIDP))
+//						oa.setHjid(oa.getHjid() - 3000000);
+//					else
+//						log.warn("Inconsistent state found! Service Identifier for OA found but Hjid is > 1000000.");
+//					
+//				}
 				
 			}
 			
diff --git a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/NewConfigurationDBRead.java b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/NewConfigurationDBRead.java
index 3928cf8c0..a3d01024c 100644
--- a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/NewConfigurationDBRead.java
+++ b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/NewConfigurationDBRead.java
@@ -84,13 +84,13 @@ public class NewConfigurationDBRead {
 						String hjID = KeyValueUtils.getFirstChildAfterPrefix(oaKeyId, KeyValueUtils.getParentKey(oaKeyId));
 						//TODO: work-around for old configTool and new key/value configuration
 						//see BasicOAAction.java line 493
-						if (serviceType.equals(MOAIDConfigurationConstants.PREFIX_GATEWAY))						
-							jaxBOA.setHjid(Long.valueOf(hjID) + 1000000);
-						else if (serviceType.equals(MOAIDConfigurationConstants.PREFIX_IIDP))
-							jaxBOA.setHjid(Long.valueOf(hjID) + 2000000);
-						else if (serviceType.equals(MOAIDConfigurationConstants.PREFIX_VIDP))
-							jaxBOA.setHjid(Long.valueOf(hjID) + 3000000);
-						else
+//						if (serviceType.equals(MOAIDConfigurationConstants.PREFIX_GATEWAY))						
+//							jaxBOA.setHjid(Long.valueOf(hjID) + 1000000);
+//						else if (serviceType.equals(MOAIDConfigurationConstants.PREFIX_IIDP))
+//							jaxBOA.setHjid(Long.valueOf(hjID) + 2000000);
+//						else if (serviceType.equals(MOAIDConfigurationConstants.PREFIX_VIDP))
+//							jaxBOA.setHjid(Long.valueOf(hjID) + 3000000);
+//						else
 							jaxBOA.setHjid(Long.valueOf(hjID));
 						
 						Logger.debug("Transformation finished with JaxB hjID: " + hjID);