keycloak-aplcache

Merge pull request #3403 from mposolda/master KEYCLOAK-3773

10/20/2016 3:31:37 PM

Details

diff --git a/model/jpa/src/main/java/org/keycloak/models/jpa/RealmAdapter.java b/model/jpa/src/main/java/org/keycloak/models/jpa/RealmAdapter.java
index 930158c..ebfa5bc 100755
--- a/model/jpa/src/main/java/org/keycloak/models/jpa/RealmAdapter.java
+++ b/model/jpa/src/main/java/org/keycloak/models/jpa/RealmAdapter.java
@@ -2053,7 +2053,7 @@ public class RealmAdapter implements RealmModel, JpaModel<RealmEntity> {
         em.persist(c);
         setConfig(model, c);
         model.setId(c.getId());
-        KeycloakModelUtils.notifyCreated(session, this, model);
+        ComponentUtil.notifyCreated(session, this, model);
 
         return model;
     }
diff --git a/model/mongo/src/main/java/org/keycloak/models/mongo/keycloak/adapters/RealmAdapter.java b/model/mongo/src/main/java/org/keycloak/models/mongo/keycloak/adapters/RealmAdapter.java
index a17e020..e60055b 100755
--- a/model/mongo/src/main/java/org/keycloak/models/mongo/keycloak/adapters/RealmAdapter.java
+++ b/model/mongo/src/main/java/org/keycloak/models/mongo/keycloak/adapters/RealmAdapter.java
@@ -1966,7 +1966,7 @@ public class RealmAdapter extends AbstractMongoAdapter<MongoRealmEntity> impleme
         model.setId(entity.getId());
         realm.getComponentEntities().add(entity);
         updateRealm();
-        KeycloakModelUtils.notifyCreated(session, this, model);
+        ComponentUtil.notifyCreated(session, this, model);
         return model;
     }
 
@@ -2074,7 +2074,7 @@ public class RealmAdapter extends AbstractMongoAdapter<MongoRealmEntity> impleme
     @Override
     public ComponentModel getComponent(String id) {
         for (ComponentEntity entity : realm.getComponentEntities()) {
-            if (entity.getId() == entity.getId()) {
+            if (id.equals(entity.getId())) {
                 return entityToModel(entity);
             }
         }
diff --git a/server-spi/src/main/java/org/keycloak/models/utils/ComponentUtil.java b/server-spi/src/main/java/org/keycloak/models/utils/ComponentUtil.java
index 507bfff..3572db8 100644
--- a/server-spi/src/main/java/org/keycloak/models/utils/ComponentUtil.java
+++ b/server-spi/src/main/java/org/keycloak/models/utils/ComponentUtil.java
@@ -20,6 +20,7 @@ package org.keycloak.models.utils;
 import org.keycloak.component.ComponentFactory;
 import org.keycloak.component.ComponentModel;
 import org.keycloak.models.KeycloakSession;
+import org.keycloak.models.RealmModel;
 import org.keycloak.provider.Provider;
 import org.keycloak.provider.ProviderConfigProperty;
 import org.keycloak.provider.ProviderFactory;
@@ -61,4 +62,9 @@ public class ComponentUtil {
         return cf;
     }
 
+    public static void notifyCreated(KeycloakSession session, RealmModel realm, ComponentModel model) {
+        ComponentFactory factory = getComponentFactory(session, model);
+        factory.onCreate(session, realm, model);
+    }
+
 }
diff --git a/server-spi/src/main/java/org/keycloak/models/utils/KeycloakModelUtils.java b/server-spi/src/main/java/org/keycloak/models/utils/KeycloakModelUtils.java
index 8ef188c..7edfea5 100755
--- a/server-spi/src/main/java/org/keycloak/models/utils/KeycloakModelUtils.java
+++ b/server-spi/src/main/java/org/keycloak/models/utils/KeycloakModelUtils.java
@@ -682,17 +682,4 @@ public final class KeycloakModelUtils {
         }
     }
 
-
-    public static void notifyCreated(KeycloakSession session, RealmModel realm, ComponentModel model) {
-        Class<? extends Provider> providerClass = null;
-        try {
-            providerClass = (Class<? extends Provider>)Class.forName(model.getProviderType());
-        } catch (ClassNotFoundException e) {
-            return;
-        }
-        ProviderFactory factory = session.getKeycloakSessionFactory().getProviderFactory(providerClass, model.getProviderId());
-        if (factory instanceof ComponentFactory && factory != null) {
-            ((ComponentFactory)factory).onCreate(session, realm, model);
-        }
-    }
 }