From 8200793f22c0ec9fc1ab9026406fe4d3a8cbaab7 Mon Sep 17 00:00:00 2001
From: rsanchez <rsanchez@curisit.net>
Date: Wed, 17 Dec 2014 12:30:46 +0000
Subject: [PATCH] #2205 feature - Added support for name or reference and email in license requests
---
securis/src/main/java/net/curisit/securis/services/LicenseResource.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/securis/src/main/java/net/curisit/securis/services/LicenseResource.java b/securis/src/main/java/net/curisit/securis/services/LicenseResource.java
index cf10c6b..46db766 100644
--- a/securis/src/main/java/net/curisit/securis/services/LicenseResource.java
+++ b/securis/src/main/java/net/curisit/securis/services/LicenseResource.java
@@ -213,7 +213,7 @@
validateRequestData(lic.getPack(), lic.getRequestData());
- License existingLicense = License.findLicenseByRequestData(lic.getRequestData(), em);
+ License existingLicense = License.findActiveLicenseByRequestData(lic.getRequestData(), em);
if (existingLicense != null && existingLicense.getStatus() == LicenseStatus.ACTIVE) {
throw new SeCurisServiceException(ErrorCodes.NO_AVAILABLE_LICENSES, "The pack has not available licenses");
}
@@ -379,7 +379,7 @@
User createdBy = userHelper.getUser(bsc.getUserPrincipal().getName(), em);
if (lic.getRequestData() != null) {
- License existingLicense = License.findLicenseByRequestData(lic.getRequestData(), em);
+ License existingLicense = License.findActiveLicenseByRequestData(lic.getRequestData(), em);
if (existingLicense != null) {
throw new SeCurisServiceException(ErrorCodes.DUPLICATED_REQUEST_DATA, "There is already an active license for current request data");
}
--
Gitblit v1.3.2