Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Bill Burke committed 2015-02-20 09:23:18 -05:00
commit 42ffe21f91
97 files changed
+2501 -643

No files matched your search

@@ -1,5 +1,6 @@
package org.keycloak.models.cache;
import org.keycloak.models.CredentialValidationOutput;
import org.keycloak.models.KeycloakSession;
import org.keycloak.models.KeycloakTransaction;
import org.keycloak.models.RealmModel;
@@ -282,6 +283,11 @@ public class DefaultCacheUserProvider implements CacheUserProvider {
return getDelegate().validCredentials(realm, user, input);
}
@Override
public CredentialValidationOutput validCredentials(RealmModel realm, UserCredentialModel... input) {
return getDelegate().validCredentials(realm, input);
}
@Override
public void preRemove(RealmModel realm) {
realmInvalidations.add(realm.getId());
@@ -1,5 +1,6 @@
package org.keycloak.models.cache;
import org.keycloak.models.CredentialValidationOutput;
import org.keycloak.models.KeycloakSession;
import org.keycloak.models.RealmModel;
import org.keycloak.models.RoleModel;
@@ -155,6 +156,11 @@ public class NoCacheUserProvider implements CacheUserProvider {
return getDelegate().validCredentials(realm, user, input);
}
@Override
public CredentialValidationOutput validCredentials(RealmModel realm, UserCredentialModel... input) {
return getDelegate().validCredentials(realm, input);
}
@Override
public void preRemove(RealmModel realm) {
getDelegate().preRemove(realm);