X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=auth%2Fauth-batch%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Faaf%2Fauth%2Fbatch%2Fapprovalsets%2FURApprovalSet.java;h=7f7bff28bcb6a1e0927731cfdd112b92bf221b0f;hb=889a9891f6df5bbb26a760cfb106be947e87aa5c;hp=2c1ffe6d28cf655318146aff0c2764d700bfa8aa;hpb=a50007dcded86acc2dcd610810f8afac720a058a;p=aaf%2Fauthz.git

diff --git a/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/approvalsets/URApprovalSet.java b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/approvalsets/URApprovalSet.java
index 2c1ffe6d..7f7bff28 100644
--- a/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/approvalsets/URApprovalSet.java
+++ b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/approvalsets/URApprovalSet.java
@@ -49,8 +49,12 @@ public class URApprovalSet extends ApprovalSet {
 		UserRoleDAO.Data urdd = lurdd.load();
 		setConstruct(urdd.bytify());
 		setMemo(getMemo(urdd));
-		setExpires(org.expiration(null, Organization.Expiration.UserInRole));
-		setTargetKey(urdd.role);
+		GregorianCalendar expires = org.expiration(null, Organization.Expiration.UserInRole);
+		if(urdd.expires.before(expires.getTime())) {
+			expires.setTime(urdd.expires);
+		}
+		setExpires(expires);
+		setTargetKey(urdd.user+'|'+urdd.role);
 		setTargetDate(urdd.expires);
 		
 		Result<RoleDAO.Data> r = dv.roleByName(trans, urdd.role);