#459 Master alphanumeric MetaDataSource type fix

- revert small changes and save only necessary changes
SCADA-LTS · Feb 13, 2018 · 53aff70 · 53aff70
1 parent 1c6c518
commit 53aff70
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 5 deletions.
diff --git 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
@@ -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
@@ -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);
 			}
 		}