Return-Path: X-Original-To: apmail-cxf-commits-archive@www.apache.org Delivered-To: apmail-cxf-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 0ACC21954D for ; Thu, 21 Apr 2016 12:40:36 +0000 (UTC) Received: (qmail 15327 invoked by uid 500); 21 Apr 2016 12:40:35 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 15262 invoked by uid 500); 21 Apr 2016 12:40:35 -0000 Mailing-List: contact commits-help@cxf.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cxf.apache.org Delivered-To: mailing list commits@cxf.apache.org Received: (qmail 15253 invoked by uid 99); 21 Apr 2016 12:40:35 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 21 Apr 2016 12:40:35 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id A3C2FDFB8E; Thu, 21 Apr 2016 12:40:35 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: sergeyb@apache.org To: commits@cxf.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: cxf git commit: Another update to JPACodeDataProvider Date: Thu, 21 Apr 2016 12:40:35 +0000 (UTC) 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 Authored: Thu Apr 21 13:39:24 2016 +0100 Committer: Sergey Beryozkin 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); } }