Repository: syncope Updated Branches: refs/heads/2_0_X fffee9f15 -> 6634daaee
SYNCOPE-1174 - NPE in AccessTokenDataBinderImpl if no 'jwt.lifetime.minutes' schema is present Project: http://git-wip-us.apache.org/repos/asf/syncope/repo Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/6634daae Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/6634daae Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/6634daae Branch: refs/heads/2_0_X Commit: 6634daaeebbe95fea9e1c104bc64d7b2e0d45e4b Parents: fffee9f Author: Colm O hEigeartaigh <cohei...@apache.org> Authored: Thu Jul 27 16:47:35 2017 +0100 Committer: Colm O hEigeartaigh <cohei...@apache.org> Committed: Thu Jul 27 16:48:02 2017 +0100 ---------------------------------------------------------------------- .../java/data/AccessTokenDataBinderImpl.java | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/syncope/blob/6634daae/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/data/AccessTokenDataBinderImpl.java ---------------------------------------------------------------------- diff --git a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/data/AccessTokenDataBinderImpl.java b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/data/AccessTokenDataBinderImpl.java index 13a5b93..b415fb2 100644 --- a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/data/AccessTokenDataBinderImpl.java +++ b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/data/AccessTokenDataBinderImpl.java @@ -38,6 +38,7 @@ import org.apache.syncope.core.persistence.api.dao.AccessTokenDAO; import org.apache.syncope.core.persistence.api.dao.ConfDAO; import org.apache.syncope.core.persistence.api.entity.AccessToken; import org.apache.syncope.core.persistence.api.entity.EntityFactory; +import org.apache.syncope.core.persistence.api.entity.conf.CPlainAttr; import org.apache.syncope.core.provisioning.api.data.AccessTokenDataBinder; import org.apache.syncope.core.provisioning.api.serialization.POJOHelper; import org.apache.syncope.core.spring.BeanUtils; @@ -124,9 +125,17 @@ public class AccessTokenDataBinderImpl implements AccessTokenDataBinder { } if (replaceExisting || body == null) { + int duration = 120; + CPlainAttr jwtLifetimeMins = confDAO.find("jwt.lifetime.minutes", "120"); + if (jwtLifetimeMins != null) { + duration = jwtLifetimeMins.getValues().get(0).getLongValue().intValue(); + } else { + LOG.warn("No schema found for 'jwt.lifetime.minutes'. Using default value of '120'"); + } + Triple<String, String, Date> created = generateJWT( subject, - confDAO.find("jwt.lifetime.minutes", "120").getValues().get(0).getLongValue().intValue(), + duration, claims); body = created.getMiddle();
