[SYNCOPE-1301] fixed

core/persistence-api/src/main/java/org/apache/syncope/core/persistence/api/dao/AccessTokenDAO.java

@@ -34,6 +34,8 @@ public interface AccessTokenDAO extends DAO<AccessToken> {
 
     AccessToken save(AccessToken accessToken);
 
+    AccessToken replace(boolean replaceExisting, AccessToken accessToken);
+
     void delete(String key);
 
     void delete(AccessToken accessToken);

core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/JPAAccessTokenDAO.java

@@ -115,6 +115,16 @@ public AccessToken save(final AccessToken accessToken) {
         return entityManager().merge(accessToken);
     }
 
+    @Override
+    public AccessToken replace(final boolean replaceExisting, final AccessToken accessToken) {
+        AccessToken existing = findByOwner(accessToken.getOwner());
+        if (replaceExisting && existing != null) {
+            delete(existing.getKey());
+        }
+
+        return replaceExisting ? save(accessToken) : existing;
+    }
+
     @Override
     public void delete(final String key) {
         AccessToken accessToken = find(key);

core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/data/AccessTokenDataBinderImpl.java

@@ -135,11 +135,7 @@ public Pair<String, Date> create(
                 accessToken.setAuthorities(authorities);
             }
 
-            accessTokenDAO.save(accessToken);
-        }
-
-        if (replaceExisting && existing != null) {
-            accessTokenDAO.delete(existing);
+            accessTokenDAO.replace(replaceExisting, accessToken);
         }
 
         return Pair.of(body, expiryTime);