cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From serg...@apache.org
Subject cxf git commit: Another update to JPACodeDataProvider
Date Thu, 21 Apr 2016 12:40:35 GMT
Repository: cxf
Updated Branches:
  refs/heads/3.1.x-fixes d1687e70d -> c0f105cfc


Another update to JPACodeDataProvider


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/c0f105cf
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/c0f105cf
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/c0f105cf

Branch: refs/heads/3.1.x-fixes
Commit: c0f105cfcbf3b0e618eedb6ea44bfa108e3a7e96
Parents: d1687e7
Author: Sergey Beryozkin <sberyozkin@gmail.com>
Authored: Thu Apr 21 13:39:24 2016 +0100
Committer: Sergey Beryozkin <sberyozkin@gmail.com>
Committed: Thu Apr 21 13:40:18 2016 +0100

----------------------------------------------------------------------
 .../cxf/rs/security/oauth2/grants/code/JPACodeDataProvider.java     | 1 +
 1 file changed, 1 insertion(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/c0f105cf/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/grants/code/JPACodeDataProvider.java
----------------------------------------------------------------------
diff --git a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/grants/code/JPACodeDataProvider.java
b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/grants/code/JPACodeDataProvider.java
index d6d759c..5766cd4 100644
--- a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/grants/code/JPACodeDataProvider.java
+++ b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/grants/code/JPACodeDataProvider.java
@@ -50,6 +50,7 @@ public class JPACodeDataProvider extends JPAOAuthDataProvider implements
Authori
             if (sub == null) {
                 getEntityManager().persist(grant.getSubject());
             } else {
+                sub = getEntityManager().merge(grant.getSubject());
                 grant.setSubject(sub);
             }
         }


Mime
View raw message