[incubator-daffodil] branch master updated: Fix thread-unsafe Logging trait usage

[mbeckerle]

This is an automated email from the ASF dual-hosted git repository.

mbeckerle pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-daffodil.git


The following commit(s) were added to refs/heads/master by this push:
     new ed9e35c  Fix thread-unsafe Logging trait usage
ed9e35c is described below

commit ed9e35c55e0ed75abab36e7d50217b937e6d4c1e
Author: Chia-Hung Lin <cli...@googlemail.com>
AuthorDate: Sun Oct 18 16:26:40 2020 +0200

    Fix thread-unsafe Logging trait usage
    
    Based on the comment in the ticket to remove the Logging mixin from
    DataProcessor, and delete the two calls to log from the DataProcessor
    class.
    
    DAFFODIL-2216
---
 .../scala/org/apache/daffodil/processors/DataProcessor.scala     | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git 
a/daffodil-runtime1/src/main/scala/org/apache/daffodil/processors/DataProcessor.scala
 
b/daffodil-runtime1/src/main/scala/org/apache/daffodil/processors/DataProcessor.scala
index f8939e3..11619a3 100644
--- 
a/daffodil-runtime1/src/main/scala/org/apache/daffodil/processors/DataProcessor.scala
+++ 
b/daffodil-runtime1/src/main/scala/org/apache/daffodil/processors/DataProcessor.scala
@@ -67,8 +67,6 @@ import org.apache.daffodil.processors.parsers.ParseError
 import org.apache.daffodil.processors.parsers.Parser
 import org.apache.daffodil.processors.unparsers.UState
 import org.apache.daffodil.processors.unparsers.UnparseError
-import org.apache.daffodil.util.LogLevel
-import org.apache.daffodil.util.Logging
 import org.apache.daffodil.util.Maybe
 import org.apache.daffodil.util.Maybe._
 import org.apache.daffodil.util.Misc
@@ -160,7 +158,7 @@ class DataProcessor private (
   protected var optDebugger : Option[Debugger],
   var validationMode: ValidationMode.Type,
   private var externalVars: Queue[Binding])
-  extends DFDL.DataProcessor with Logging
+  extends DFDL.DataProcessor
   with HasSetDebugger
   with Serializable
   with MultipleEventHandler {
@@ -357,10 +355,6 @@ class DataProcessor private (
 
   def save(output: DFDL.Output): Unit = {
 
-    externalVars.foreach{ ev =>
-      log(LogLevel.Warning, "External variable %s is not saved as part of 
saved DFDL processor.", ev.varQName)
-    }
-
     val oos = new ObjectOutputStream(new 
GZIPOutputStream(Channels.newOutputStream(output)))
 
     //
@@ -679,7 +673,6 @@ class DataProcessor private (
       case fio: FileIOException =>
         state.SDE(fio)
     }
-    log(LogLevel.Debug, "%s final stream for %s finished.", this, state)
 
     val ev = state.advanceMaybe
     if (ev.isDefined) {