From 9a2bf6350fa31e7826eaebe0298fe9e8a152513e Mon Sep 17 00:00:00 2001 From: Alexander Nozik Date: Mon, 12 Feb 2018 15:19:17 +0300 Subject: [PATCH] Fixed table metamorphing --- .../src/main/kotlin/inr/numass/actions/TransformDataAction.kt | 2 +- numass-server/src/main/java/inr/numass/server/ServerRunner.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/numass-main/src/main/kotlin/inr/numass/actions/TransformDataAction.kt b/numass-main/src/main/kotlin/inr/numass/actions/TransformDataAction.kt index a87828e9..b6ffd6dd 100644 --- a/numass-main/src/main/kotlin/inr/numass/actions/TransformDataAction.kt +++ b/numass-main/src/main/kotlin/inr/numass/actions/TransformDataAction.kt @@ -99,7 +99,7 @@ class TransformDataAction : OneToOneAction() { val res = table.addColumn(ListColumn.build(table.getColumn(COUNT_RATE_KEY).format, cr.stream())) .addColumn(ListColumn.build(table.getColumn(COUNT_RATE_ERROR_KEY).format, crErr.stream())) - context.io.output(name, name).push(NumassUtils.wrap(res, meta)) + context.io.output(name, getName()).push(NumassUtils.wrap(res, meta)) return res } diff --git a/numass-server/src/main/java/inr/numass/server/ServerRunner.java b/numass-server/src/main/java/inr/numass/server/ServerRunner.java index ed91bc59..4a244df4 100644 --- a/numass-server/src/main/java/inr/numass/server/ServerRunner.java +++ b/numass-server/src/main/java/inr/numass/server/ServerRunner.java @@ -24,7 +24,7 @@ public class ServerRunner extends SimpleConfigurable implements AutoCloseable { // private static final String NUMASS_REPO_PATH_PROPERTY = "numass.repository.path"; NumassStorage root; NumassServer listener; - Context context = Global.Companion.getContext("NUMASS_SERVER"); + Context context = Global.INSTANCE.getContext("NUMASS_SERVER"); public ServerRunner() throws IOException, ParseException { // Global.instance().getPluginManager().load(StorageManager.class);