[BZ-1158387] - Error while opening wizzard for adding keystore to Pic…

…ketlink Federation in webconsole.
wildfly · Oct 29, 2014 · 2410722 · 2410722
1 parent 6e30516
commit 2410722
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 4 deletions.
diff --git a/...in/java/org/wildfly/extension/picketlink/federation/model/handlers/HandlerAddHandler.java b/...in/java/org/wildfly/extension/picketlink/federation/model/handlers/HandlerAddHandler.java
@@ -29,6 +29,7 @@
 import org.jboss.as.controller.PathElement;
 import org.jboss.as.controller.ServiceVerificationHandler;
 import org.jboss.as.controller.SimpleAttributeDefinition;
+import org.jboss.as.controller.registry.Resource;
 import org.jboss.dmr.ModelNode;
 import org.jboss.dmr.Property;
 import org.jboss.msc.service.ServiceBuilder;
@@ -70,7 +71,7 @@ static void launchServices(final OperationContext context, final PathAddress pat
 
         newHandler.setClazz(typeName);
 
-        ModelNode handler = context.readResourceFromRoot(pathAddress).getModel();
+        ModelNode handler = Resource.Tools.readModel(context.readResourceFromRoot(pathAddress));
 
         if (handler.hasDefined(COMMON_HANDLER_PARAMETER.getName())) {
             for (Property handlerParameter : handler.get(COMMON_HANDLER_PARAMETER.getName()).asPropertyList()) {

diff --git a/...ly/extension/picketlink/federation/model/keystore/KeyStoreProviderResourceDefinition.java b/...ly/extension/picketlink/federation/model/keystore/KeyStoreProviderResourceDefinition.java
@@ -59,7 +59,7 @@ public class KeyStoreProviderResourceDefinition extends AbstractFederationResour
     public static final KeyStoreProviderResourceDefinition INSTANCE = new KeyStoreProviderResourceDefinition();
 
     private KeyStoreProviderResourceDefinition() {
-        super(ModelElement.KEY_STORE, ModelElement.KEY_STORE.getName(), KeyStoreProviderAddHandler.INSTANCE, KeyStoreProviderRemoveHandler.INSTANCE, FILE, RELATIVE_TO, PASSWORD, SIGN_KEY_ALIAS, SIGN_KEY_PASSWORD);
+        super(ModelElement.KEY_STORE, KeyStoreProviderAddHandler.INSTANCE, KeyStoreProviderRemoveHandler.INSTANCE, FILE, RELATIVE_TO, PASSWORD, SIGN_KEY_ALIAS, SIGN_KEY_PASSWORD);
     }
 
     @Override

diff --git a/...n/java/org/wildfly/extension/picketlink/federation/model/saml/SAMLResourceDefinition.java b/...n/java/org/wildfly/extension/picketlink/federation/model/saml/SAMLResourceDefinition.java
@@ -47,6 +47,6 @@ public class SAMLResourceDefinition extends AbstractFederationResourceDefinition
     public static final SAMLResourceDefinition INSTANCE = new SAMLResourceDefinition();
 
     private SAMLResourceDefinition() {
-        super(ModelElement.SAML, ModelElement.SAML.getName(), SAMLAddHandler.INSTANCE, SAMLRemoveHandler.INSTANCE, TOKEN_TIMEOUT, CLOCK_SKEW);
+        super(ModelElement.SAML, SAMLAddHandler.INSTANCE, SAMLRemoveHandler.INSTANCE, TOKEN_TIMEOUT, CLOCK_SKEW);
     }
 }
diff --git a/.../main/java/org/wildfly/extension/picketlink/federation/service/EntityProviderService.java b/.../main/java/org/wildfly/extension/picketlink/federation/service/EntityProviderService.java
@@ -219,7 +219,7 @@ void addHandler(final Handler handler) {
 
         for (Handler actualHandler : new ArrayList<Handler>(handlers.getHandler())) {
             if (actualHandler.getClazz().equals(handler.getClazz())) {
-                throw PicketLinkLogger.ROOT_LOGGER.typeAlreadyDefined(handler.getClazz());
+                return;
             }
         }