keycloak-aplcache

diff --git a/model/jpa/src/main/java/org/keycloak/models/jpa/entities/RoleEntity.java b/model/jpa/src/main/java/org/keycloak/models/jpa/entities/RoleEntity.java
index a17f8e5..db40cea 100755
--- a/model/jpa/src/main/java/org/keycloak/models/jpa/entities/RoleEntity.java
+++ b/model/jpa/src/main/java/org/keycloak/models/jpa/entities/RoleEntity.java
@@ -140,11 +140,11 @@ public class RoleEntity {
     @Override
     public boolean equals(Object o) {
         if (this == o) return true;
-        if (o == null || getClass() != o.getClass()) return false;
+        if (!(o instanceof RoleEntity)) return false;
 
         RoleEntity that = (RoleEntity) o;
 
-        if (!id.equals(that.id)) return false;
+        if (!id.equals(that.getId())) return false;
 
         return true;
     }