[BZ-1121155] - PicketLink SP application configuration is ignored whe…

…n it is also added to PicketLink subsystem.
wildfly · Oct 23, 2014 · bede0eb · bede0eb
1 parent 75d3f67
commit bede0eb
Showing 1 changed file with 9 additions and 1 deletion.
diff --git a/...n/java/org/wildfly/extension/picketlink/federation/service/DomainModelConfigProvider.java b/...n/java/org/wildfly/extension/picketlink/federation/service/DomainModelConfigProvider.java
@@ -31,9 +31,9 @@
 import org.picketlink.identity.federation.web.config.IDPMetadataConfigurationProvider;
 import org.picketlink.identity.federation.web.config.SPPostMetadataConfigurationProvider;
 import org.picketlink.identity.federation.web.config.SPRedirectMetadataConfigurationProvider;
-import org.wildfly.extension.picketlink.logging.PicketLinkLogger;
 import org.wildfly.extension.picketlink.federation.config.IDPConfiguration;
 import org.wildfly.extension.picketlink.federation.config.SPConfiguration;
+import org.wildfly.extension.picketlink.logging.PicketLinkLogger;
 
 import java.io.InputStream;
 
@@ -70,6 +70,10 @@ public IDPType getIDPConfiguration() {
                 }
             }
 
+            if (configParsedIDPType != null) {
+                configuration.importFrom(configParsedIDPType);
+            }
+
             return (IDPType) providerType;
         }
 
@@ -101,6 +105,10 @@ public SPType getSPConfiguration() {
                 }
             }
 
+            if (configParsedSPType != null) {
+                configuration.importFrom(configParsedSPType);
+            }
+
             return (SPType) providerType;
         }