[incubator-daffodil] branch master updated: Fix bug in handling parse errors

[sl...@apache.org]

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

slawrence 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 135e74c  Fix bug in handling parse errors
135e74c is described below

commit 135e74cffaa3b9146b539ef8cdde056cc53ab94f
Author: Brandon Sloane <bs...@tresys.com>
AuthorDate: Mon Mar 18 14:13:01 2019 -0400

    Fix bug in handling parse errors
    
    ProcessingError.toParseError would erroneasuly pass it's formatString an
    args to ParseError. This is problamatic because it also passes itself
    as the cause (which is correct), but it is not allowed to pass both
    a cause and a formatString.
    
    DAFFODIL-2100
---
 .../main/scala/org/apache/daffodil/processors/ProcessingError.scala   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/daffodil-runtime1/src/main/scala/org/apache/daffodil/processors/ProcessingError.scala b/daffodil-runtime1/src/main/scala/org/apache/daffodil/processors/ProcessingError.scala
index 1db295a..656cc27 100644
--- a/daffodil-runtime1/src/main/scala/org/apache/daffodil/processors/ProcessingError.scala
+++ b/daffodil-runtime1/src/main/scala/org/apache/daffodil/processors/ProcessingError.scala
@@ -47,13 +47,13 @@ abstract class ProcessingError protected (
    * looks like the same as other parse errors to tests that search for the
    * "Parse Error" string.
    */
-  def toParseError = new ParseError(schemaContext, dataContext, Maybe(this), maybeFormatString, args: _*)
+  def toParseError = new ParseError(schemaContext, dataContext, Maybe(this), Maybe.Nope)
 
   /**
    * Used to convert a processing error into a unparse error so that it
    * looks like the same as other unparse errors to tests that search for the
    * "Unparse Error" string.
    */
-  def toUnparseError = new UnparseError(schemaContext, dataContext, maybeCause, maybeFormatString, args: _*)
+  def toUnparseError = new UnparseError(schemaContext, dataContext, Maybe(this), Maybe.Nope)
 
 }