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/helpers/LicenseHelper.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/securis/src/main/java/net/curisit/securis/services/helpers/LicenseHelper.java b/securis/src/main/java/net/curisit/securis/services/helpers/LicenseHelper.java
index 191e53d..e3346b2 100644
--- a/securis/src/main/java/net/curisit/securis/services/helpers/LicenseHelper.java
+++ b/securis/src/main/java/net/curisit/securis/services/helpers/LicenseHelper.java
@@ -45,7 +45,7 @@
         LicenseHistory lh = new LicenseHistory();
         lh.setLicense(lic);
         lh.setUser(user);
-        lh.setTimestamp(new Date());
+        lh.setCreationTimestamp(new Date());
         lh.setAction(action);
         lh.setComments(comments);
         return lh;

--
Gitblit v1.3.2