From 3987c07040b8db019efa40b4ac8e0ba48350f53b Mon Sep 17 00:00:00 2001 From: Alexander Nozik Date: Thu, 25 May 2017 19:49:43 +0300 Subject: [PATCH] Server update --- .../src/main/java/inr/numass/cryotemp/PKT8Device.java | 2 +- numass-server/src/main/java/inr/numass/server/TestServer.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) 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 6afa2e5f..09a66e5d 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 @@ -160,7 +160,7 @@ public class PKT8Device extends PortSensor { public void shutdown() throws ControlException { storageHelper.close(); if (collector != null) { - collector.clear(); + collector.stop(); collector = null; } super.shutdown(); diff --git a/numass-server/src/main/java/inr/numass/server/TestServer.java b/numass-server/src/main/java/inr/numass/server/TestServer.java index be14e0e9..1d943ee9 100644 --- a/numass-server/src/main/java/inr/numass/server/TestServer.java +++ b/numass-server/src/main/java/inr/numass/server/TestServer.java @@ -8,7 +8,7 @@ package inr.numass.server; import hep.dataforge.context.Context; import hep.dataforge.context.Global; import hep.dataforge.server.ServerManager; -import hep.dataforge.server.storage.StorageServeUtils; +import hep.dataforge.server.storage.StorageServerUtils; import hep.dataforge.storage.commons.StorageManager; import hep.dataforge.storage.filestorage.FileStorageFactory; import inr.numass.storage.NumassStorage; @@ -36,7 +36,7 @@ public class TestServer { context.getLogger().info("Starting test numass storage servlet in '{}'", path); NumassStorage storage = new NumassStorage(context, FileStorageFactory.buildStorageMeta(path, true, true)); - StorageServeUtils.addStorage(serverManager,storage,"numass-storage"); + StorageServerUtils.addStorage(serverManager,storage,"numass-storage"); serverManager.startServer();