From 1faf5b452c9f3680d5a459edbc0d7877078b6a5a Mon Sep 17 00:00:00 2001 From: Alexander Nozik Date: Thu, 20 Oct 2016 06:36:41 +0300 Subject: [PATCH] Fixed 'available' loop in tcpPortHandler. Dramatic improvement in performance. --- numass-control/cryotemp/build.gradle | 1 - .../src/main/java/inr/numass/cryotemp/PKT8Device.java | 2 +- numass-control/vac/build.gradle | 8 +++++++- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/numass-control/cryotemp/build.gradle b/numass-control/cryotemp/build.gradle index b541c252..e0abba66 100644 --- a/numass-control/cryotemp/build.gradle +++ b/numass-control/cryotemp/build.gradle @@ -13,7 +13,6 @@ configurations { compile.exclude module: 'groovy' compile.exclude module: 'groovy-all' compile.exclude module: 'shichimifx' - compile.exclude module: 'jssc' compile.exclude module: 'zt-zip' } diff --git a/numass-control/cryotemp/src/main/java/inr/numass/cryotemp/PKT8Device.java b/numass-control/cryotemp/src/main/java/inr/numass/cryotemp/PKT8Device.java index d36f6e8b..a3c72a05 100644 --- a/numass-control/cryotemp/src/main/java/inr/numass/cryotemp/PKT8Device.java +++ b/numass-control/cryotemp/src/main/java/inr/numass/cryotemp/PKT8Device.java @@ -261,7 +261,7 @@ public class PKT8Device extends PortSensor { .map(it -> ((StorageConnection) it.getKey()).getStorage()).collect(Collectors.toList()); storages.forEach(storage -> { - String suffix = Integer.toString((int) DateTimeUtils.now().toEpochMilli()); + String suffix = Long.toString(DateTimeUtils.now().toEpochMilli()); PointLoader pointLoader = null; try { diff --git a/numass-control/vac/build.gradle b/numass-control/vac/build.gradle index 37fdda06..c1b8daa0 100644 --- a/numass-control/vac/build.gradle +++ b/numass-control/vac/build.gradle @@ -1,12 +1,18 @@ apply plugin: 'application' -version = "0.4.1" +version = "0.4.2" if (!hasProperty('mainClass')) { ext.mainClass = 'inr.numass.readvac.app.ReadVac' } mainClassName = mainClass +configurations { + compile.exclude module: 'groovy' + compile.exclude module: 'groovy-all' + compile.exclude module: 'shichimifx' + compile.exclude module: 'zt-zip' +} dependencies { compile project(':numass-storage:numass-client')