details: https://code.openbravo.com/erp/devel/pi/rev/094cb3054f4d
changeset: 32682:094cb3054f4d
user: Asier Lostalé <asier.lostale <at> openbravo.com>
date: Thu Sep 14 10:52:34 2017 +0200
summary: fixed bug 36855: license refresh is requested to butler too often
Prevented refreshal for:
- First login after Tomcat restart
- In case butler detected license didn't change
diffstat:
src/org/openbravo/erpCommon/obps/ActivationKey.java | 18 ++++++++++--------
1 files changed, 10 insertions(+), 8 deletions(-)
diffs (49 lines):
diff -r 3398cf233133 -r 094cb3054f4d
src/org/openbravo/erpCommon/obps/ActivationKey.java
--- a/src/org/openbravo/erpCommon/obps/ActivationKey.java Wed Sep 06
13:23:35 2017 +0200
+++ b/src/org/openbravo/erpCommon/obps/ActivationKey.java Thu Sep 14
10:52:34 2017 +0200
@@ -292,7 +292,7 @@
public static synchronized void setInstance(ActivationKey ak) {
instance = ak;
- ak.setRefreshTime(new Date());
+ ak.resetRefreshTime();
ak.lastUpdateTimestamp = getSystem().getUpdated();
}
@@ -305,8 +305,8 @@
}
}
- private void setRefreshTime(Date time) {
- lastRefreshTime = time;
+ private void resetRefreshTime() {
+ lastRefreshTime = new Date();
}
/**
@@ -543,6 +543,9 @@
}
checkDates();
+
+ // this occurs on Tomcat start, don't want to try to refresh on next
login, let's wait for 24hr
+ resetRefreshTime();
}
private void reset() {
@@ -1626,11 +1629,10 @@
OBContext.restorePreviousMode();
}
- if (!refreshed) {
- // Even license couldn't be refreshed, set lastRefreshTime not to try
to
- // refresh in the following period of time
- lastRefreshTime = new Date();
- }
+ // Even license couldn't be refreshed, set lastRefreshTime not to try to
+ // refresh in the following period of time
+ resetRefreshTime();
+
log.info("License refreshed in " + (System.currentTimeMillis() - t) +
"ms");
return refreshed;
} finally {
------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
