jadams-tresys closed pull request #135: Show different error message for OOM
URL: https://github.com/apache/incubator-daffodil/pull/135
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/daffodil-cli/src/main/scala/org/apache/daffodil/Main.scala
b/daffodil-cli/src/main/scala/org/apache/daffodil/Main.scala
index 10e97ea92..26b6e66ae 100644
--- a/daffodil-cli/src/main/scala/org/apache/daffodil/Main.scala
+++ b/daffodil-cli/src/main/scala/org/apache/daffodil/Main.scala
@@ -1355,6 +1355,20 @@ object Main extends Logging {
log(LogLevel.Error, "%s", e.getMessage())
1
}
+ case e: OutOfMemoryError => {
+ System.err.println("""|
+
|!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+ |!! Daffodil ran out of memory!
!!
+
|!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+ |
+ | Try increasing the amount of memory by changing
or
+ | setting the DAFFODIL_JAVA_OPTS environment
variable.
+ | "DAFFODIL_JAVA_OPTS=-Xmx5G" for 5GB.
+ |
+ |""".stripMargin)
+ e.printStackTrace
+ 1
+ }
case e: Exception => {
bugFound(e)
}
diff --git
a/daffodil-runtime1/src/main/scala/org/apache/daffodil/processors/parsers/Parser.scala
b/daffodil-runtime1/src/main/scala/org/apache/daffodil/processors/parsers/Parser.scala
index a5b972b27..af3804d25 100644
---
a/daffodil-runtime1/src/main/scala/org/apache/daffodil/processors/parsers/Parser.scala
+++
b/daffodil-runtime1/src/main/scala/org/apache/daffodil/processors/parsers/Parser.scala
@@ -271,7 +271,7 @@ class ChoiceParser(ctxt: RuntimeData, val childParsers:
Vector[Parser])
case t: Throwable => {
if (pBefore != null) {
markLeakCausedByException = true
- if (!t.isInstanceOf[SchemaDefinitionDiagnosticBase] &&
!t.isInstanceOf[UnsuppressableException]) {
+ if (!t.isInstanceOf[SchemaDefinitionDiagnosticBase] &&
!t.isInstanceOf[UnsuppressableException] && !t.isInstanceOf[java.lang.Error]) {
val stackTrace = new StringWriter()
t.printStackTrace(new PrintWriter(stackTrace))
Assert.invariantFailed("Exception thrown with mark not returned: "
+ t + "\nStackTrace:\n" + stackTrace)
diff --git
a/daffodil-runtime1/src/main/scala/org/apache/daffodil/processors/parsers/SequenceParserBases.scala
b/daffodil-runtime1/src/main/scala/org/apache/daffodil/processors/parsers/SequenceParserBases.scala
index 849b7d1c8..9b0fbbd89 100644
---
a/daffodil-runtime1/src/main/scala/org/apache/daffodil/processors/parsers/SequenceParserBases.scala
+++
b/daffodil-runtime1/src/main/scala/org/apache/daffodil/processors/parsers/SequenceParserBases.scala
@@ -238,7 +238,7 @@ abstract class OrderedSequenceParserBase(
if (pstate.isInUse(priorState)) {
markLeakCausedByException = true
pstate.discard(priorState)
- if (!t.isInstanceOf[SchemaDefinitionDiagnosticBase] &&
!t.isInstanceOf[UnsuppressableException]) {
+ if (!t.isInstanceOf[SchemaDefinitionDiagnosticBase] &&
!t.isInstanceOf[UnsuppressableException] && !t.isInstanceOf[java.lang.Error]) {
val stackTrace = new StringWriter()
t.printStackTrace(new PrintWriter(stackTrace))
Assert.invariantFailed("Exception thrown with mark not
returned: " + t + "\nStackTrace:\n" + stackTrace)
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
With regards,
Apache Git Services
