updates pulled from cmusphinx/sphinx4 master

Author: SeH

sphinx4-core/src/main/java/edu/cmu/sphinx/jsgf/JSGFGrammar.java

@@ -201,11 +201,13 @@ public JSGFGrammar(URL baseURL, String grammarName,
             Dictionary dictionary) {
         super(showGrammar, optimizeGrammar, addSilenceWords, addFillerWords,
                 dictionary);
+
+        logger = Logger.getLogger(getClass().getName());
         logMath = LogMath.getLogMath();
+
         this.baseURL = baseURL;
         this.grammarName = grammarName;
         loadGrammar = true;
-        logger = Logger.getLogger(getClass().getName());
     }
 
     public JSGFGrammar() {
@@ -222,10 +224,13 @@ public JSGFGrammar() {
     @Override
     public void newProperties(PropertySheet ps) throws PropertyException {
         super.newProperties(ps);
+        logger = ps.getLogger();
+        logMath = LogMath.getLogMath();
+
         baseURL = ConfigurationManagerUtils.getResource(PROP_BASE_GRAMMAR_URL,
                 ps);
-        logger = ps.getLogger();
         grammarName = ps.getString(PROP_GRAMMAR_NAME);
+
         loadGrammar = true;
     }
 

sphinx4-core/src/main/java/edu/cmu/sphinx/linguist/language/grammar/FSTGrammar.java

@@ -127,8 +127,9 @@ protected GrammarNode createGrammar(String bogusText)
 
     public FSTGrammar(String path, boolean showGrammar, boolean optimizeGrammar, boolean addSilenceWords, boolean addFillerWords, Dictionary dictionary) {
         super(showGrammar,optimizeGrammar,addSilenceWords,addFillerWords,dictionary);
-        this.path = path;
         logMath = LogMath.getLogMath();
+
+        this.path = path;
     }
 
     public FSTGrammar() {
@@ -144,6 +145,7 @@ public FSTGrammar() {
     @Override
     public void newProperties(PropertySheet ps) throws PropertyException {
         super.newProperties(ps);
+        logMath = LogMath.getLogMath();
 
         path = ps.getString(PROP_PATH);
     }

sphinx4-core/src/main/java/edu/cmu/sphinx/linguist/language/grammar/SimpleWordListGrammar.java

@@ -79,6 +79,7 @@ public void newProperties(PropertySheet ps) throws PropertyException {
 
         path = ps.getString(PROP_PATH);
         isLooping = ps.getBoolean(PROP_LOOP);
+        logMath = LogMath.getLogMath();
     }