From 9f2863c9533f3c31e38799abb59f7322fbf4c0bb Mon Sep 17 00:00:00 2001 From: gnosygnu Date: Mon, 24 Oct 2016 09:36:30 -0400 Subject: [PATCH] Mass_parse: Do not return null if MACHINENAME / HOSTNAME is not available --- 100_core/src/gplx/core/envs/System_.java | 4 ++-- .../bldrs/mass_parses/parses/mgrs/Xomp_parse_mgr_cfg.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/100_core/src/gplx/core/envs/System_.java b/100_core/src/gplx/core/envs/System_.java index ae3a0db9e..f27b246df 100644 --- a/100_core/src/gplx/core/envs/System_.java +++ b/100_core/src/gplx/core/envs/System_.java @@ -48,10 +48,10 @@ public class System_ { // *** environment variables: getenv public static String Env__machine_name() { - String rv = "UNKNOWN_MACHINE_NAME"; + String rv = ""; rv = Env__get(Env_key__computername); if (String_.Len_gt_0(rv)) return rv; rv = Env__get(Env_key__hostname); if (String_.Len_gt_0(rv)) return rv; - return rv; + return "UNKNOWN_MACHINE_NAME"; } private static String Env__get(String key) { return System.getenv(key); diff --git a/400_xowa/src/gplx/xowa/addons/bldrs/mass_parses/parses/mgrs/Xomp_parse_mgr_cfg.java b/400_xowa/src/gplx/xowa/addons/bldrs/mass_parses/parses/mgrs/Xomp_parse_mgr_cfg.java index 8ca80fdd0..15c8ab62e 100644 --- a/400_xowa/src/gplx/xowa/addons/bldrs/mass_parses/parses/mgrs/Xomp_parse_mgr_cfg.java +++ b/400_xowa/src/gplx/xowa/addons/bldrs/mass_parses/parses/mgrs/Xomp_parse_mgr_cfg.java @@ -35,7 +35,7 @@ public class Xomp_parse_mgr_cfg implements Gfo_invk { public Io_url Mgr_url() {return mgr_url;} private Io_url mgr_url; public String Wkr_machine_name() {return wkr_machine_name;} private String wkr_machine_name; public boolean Show_msg__fetched_pool() {return show_msg__fetched_pool;} private boolean show_msg__fetched_pool; - public void Init(Xowe_wiki wiki) { + public void Init1(Xowe_wiki wiki) { if (num_wkrs == -1) num_wkrs = gplx.core.envs.Runtime_.Cpu_count(); if (num_pages_in_pool == -1) num_pages_in_pool = num_wkrs * 1000; if (mgr_url == null) mgr_url = wiki.Fsys_mgr().Root_dir().GenSubDir_nest("tmp", "xomp");