diff --git a/base/src/org/compiere/Adempiere.java b/base/src/org/compiere/Adempiere.java index 9426820d29..e573779197 100644 --- a/base/src/org/compiere/Adempiere.java +++ b/base/src/org/compiere/Adempiere.java @@ -473,11 +473,10 @@ public final class Adempiere return true; // Check Version - if (!Login.isJavaOK(isClient) && isClient) + if (isClient && !Login.isJavaOK(isClient)) System.exit(1); - CLogMgt.initialize(isClient); - Ini.setClient (isClient); // Ini requires Logging + Ini.setClient (isClient); // init logging in Ini // Init Log log = CLogger.getCLogger(Adempiere.class); // Greeting diff --git a/base/src/org/compiere/util/Ini.java b/base/src/org/compiere/util/Ini.java index 917ffcbb7e..0c9c4ccf57 100644 --- a/base/src/org/compiere/util/Ini.java +++ b/base/src/org/compiere/util/Ini.java @@ -234,7 +234,7 @@ public final class Ini implements Serializable private static String s_propertyFileName = null; /** Logger */ - private static Logger log = Logger.getLogger(Ini.class.getName()); + private static Logger log = null; /** * Save INI parameters to disk @@ -711,7 +711,11 @@ public final class Ini implements Serializable */ public static void setClient (boolean client) { + if (log != null) //already initialized + return; s_client = client; + CLogMgt.initialize(client); + log = Logger.getLogger(Ini.class.getName()); } // setClient /** diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/session/WebUIServlet.java b/zkwebui/WEB-INF/src/org/adempiere/webui/session/WebUIServlet.java index bd256cff27..3cd2bec7d5 100644 --- a/zkwebui/WEB-INF/src/org/adempiere/webui/session/WebUIServlet.java +++ b/zkwebui/WEB-INF/src/org/adempiere/webui/session/WebUIServlet.java @@ -71,16 +71,6 @@ public class WebUIServlet extends DHtmlLayoutServlet /** * Start ADempiere */ - logger.info("Starting ADempiere..."); - try - { - CLogMgt.initialize(false); - } - catch(Exception ex) - { - logger.log(Level.SEVERE, "Could not initialize ADempiere logging Management", ex); - } - boolean started = Adempiere.startup(false); if(!started) {