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/db/License.java | 6 +++---
securis/src/main/java/net/curisit/securis/services/ApiResource.java | 6 +++++-
2 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/securis/src/main/java/net/curisit/securis/db/License.java b/securis/src/main/java/net/curisit/securis/db/License.java
index fcaec12..ba3c11f 100644
--- a/securis/src/main/java/net/curisit/securis/db/License.java
+++ b/securis/src/main/java/net/curisit/securis/db/License.java
@@ -70,7 +70,7 @@
@Id
@GeneratedValue
- private int id;
+ private Integer id;
private String code;
@@ -147,7 +147,7 @@
@JsonIgnore
private List<LicenseHistory> history;
- public int getId() {
+ public Integer getId() {
return id;
}
@@ -269,7 +269,7 @@
this.email = email;
}
- public void setId(int id) {
+ public void setId(Integer id) {
this.id = id;
}
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