From 04f9a9d2dbd2d79bfffea9c5a6b7ba1b32c5f42b Mon Sep 17 00:00:00 2001
From: rsanchez <rsanchez@curisit.net>
Date: Mon, 17 Nov 2014 15:29:03 +0000
Subject: [PATCH] #396 fix - Supporting MySQL, changed "persist()" by "merge()"
---
securis/src/main/java/net/curisit/securis/services/LicenseResource.java | 8 ++++++--
1 files changed, 6 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 e338592..2428bb1 100644
--- a/securis/src/main/java/net/curisit/securis/services/LicenseResource.java
+++ b/securis/src/main/java/net/curisit/securis/services/LicenseResource.java
@@ -358,11 +358,11 @@
try {
lic.setRequestData(JsonUtils.toJSON((RequestBean) signedLicense));
if (BlockedRequest.isRequestBlocked(lic.getRequestData(), em)) {
- throw new SeCurisServiceException(ErrorCodes.BLOCKED_REQUEST_DATA, "Given request data is blocked and cannot be activate");
+ throw new SeCurisServiceException(ErrorCodes.BLOCKED_REQUEST_DATA, "Given request data is blocked and cannot be activated");
}
lic.setLicenseData(JsonUtils.toJSON(signedLicense));
} catch (SeCurisException e) {
- LOG.error("Error generaing license JSON", e);
+ LOG.error("Error generating license JSON", e);
throw new SeCurisServiceException(ErrorCodes.INVALID_FORMAT, "Error generating license JSON");
}
} else {
@@ -371,11 +371,15 @@
lic.setCreatedBy(createdBy);
lic.setCreationTimestamp(new Date());
lic.setModificationTimestamp(lic.getCreationTimestamp());
+ LOG.info("LICENSE: {}", lic);
em.persist(lic);
+ LOG.info("LICENSE on HISTORY create");
em.persist(licenseHelper.createLicenseHistoryAction(lic, createdBy, LicenseHistory.Actions.CREATE));
if (lic.getStatus() == LicenseStatus.ACTIVE) {
+ LOG.info("LICENSE ACTIVATION on HISTORY create");
em.persist(licenseHelper.createLicenseHistoryAction(lic, createdBy, LicenseHistory.Actions.CREATE, "Activated on creation"));
}
+ LOG.info("LICENSE created oK ??");
return Response.ok(lic).build();
}
--
Gitblit v1.3.2