From a9f3df010deef70c1e378148f008aeaa147bcf82 Mon Sep 17 00:00:00 2001
From: rsanchez <rsanchez@curisit.net>
Date: Wed, 30 Sep 2015 17:07:28 +0000
Subject: [PATCH] #0 fix - Changes persist() by merge() when license exists
---
securis/src/main/java/net/curisit/securis/services/ApiResource.java | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/securis/src/main/java/net/curisit/securis/services/ApiResource.java b/securis/src/main/java/net/curisit/securis/services/ApiResource.java
index 20fe504..4f3def4 100644
--- a/securis/src/main/java/net/curisit/securis/services/ApiResource.java
+++ b/securis/src/main/java/net/curisit/securis/services/ApiResource.java
@@ -420,7 +420,11 @@
if (lic.getFullName() == null || "".equals(lic.getFullName())) {
lic.setFullName(nameOrReference);
}
- em.persist(lic);
+ if (lic.getId() != null) {
+ em.merge(lic);
+ } else {
+ em.persist(lic);
+ }
em.persist(licenseHelper.createLicenseHistoryAction(lic, user, LicenseHistory.Actions.CREATE));
if (lic.getActivationCode() != null) {
em.persist(licenseHelper.createLicenseHistoryAction(lic, user, LicenseHistory.Actions.ACTIVATE, "Activated by code on creation"));
--
Gitblit v1.3.2