From 53aff7044ba98c31321787bf7b6b5de88f0a316e Mon Sep 17 00:00:00 2001 From: Radek Jajko Date: Tue, 13 Feb 2018 13:37:23 +0100 Subject: [PATCH] #459 Master alphanumeric MetaDataSource type fix - revert small changes and save only necessary changes --- .travis.yml | 2 -- WebContent/WEB-INF/classes/env.properties | 2 +- src/org/scada_lts/mango/service/PointValueService.java | 4 ++-- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index c46e035b69..2a23fc4657 100644 --- a/.travis.yml +++ b/.travis.yml @@ -39,8 +39,6 @@ branches: - "/^PROC-.*$/" - "/^develop-sdtabilit.*$/" - "/^#179*$/" - - "/^#459.*/" - - "/^fix*$/" - "/^master-sdtabilit.*$/" - "/^v*$/" notifications: diff --git a/WebContent/WEB-INF/classes/env.properties b/WebContent/WEB-INF/classes/env.properties index 7f13831c83..0b3828295b 100644 --- a/WebContent/WEB-INF/classes/env.properties +++ b/WebContent/WEB-INF/classes/env.properties @@ -57,7 +57,7 @@ abilit.disableDataSourcesOnServerStart=false abilit.api.replace.alert.onview=true -abilit.cacheEnable=false +abilit.cacheEnable=true abilit.START_UPDATE_UNSILENCED_ALARM_LEVEL=100000 abilit.START_UPDATE_EVENT_DETECTORS=100000 abilit.START_UPDATE_PENDING_EVENTS=100000 diff --git a/src/org/scada_lts/mango/service/PointValueService.java b/src/org/scada_lts/mango/service/PointValueService.java index 124cd51abf..66dfd07d3f 100644 --- a/src/org/scada_lts/mango/service/PointValueService.java +++ b/src/org/scada_lts/mango/service/PointValueService.java @@ -223,7 +223,7 @@ long savePointValueInTrasaction(final int pointId, final int dataType, double dv retries--; } catch (RuntimeException e) { throw new RuntimeException( - "Error transactional saving point value: dataType=" + dataType + "Error saving point value: dataType=" + dataType + ", dvalue=" + dvalue, e); } } @@ -252,7 +252,7 @@ public long savePointValue(final int pointId, final int dataType, double dvalue, retries--; } catch (RuntimeException e) { throw new RuntimeException( - "Error no transaction saving point value: dataType=" + dataType + "Error saving point value: dataType=" + dataType + ", dvalue=" + dvalue, e); } }