aboutsummaryrefslogtreecommitdiff
path: root/src/main
diff options
context:
space:
mode:
authorJason Zaugg <jzaugg@gmail.com>2015-07-06 16:02:35 +1000
committerJason Zaugg <jzaugg@gmail.com>2015-07-06 16:02:35 +1000
commitd7914c3879cbe832b640c07a24ee6941fa545928 (patch)
tree4522b6199fc4316e4c15522733662dc590f3679e /src/main
parent93dab7a6fe81227953d087813d5cab0d0634b9f2 (diff)
parentf1d9667189ebad285553e912a2eac4a64093c8bf (diff)
downloadscala-async-d7914c3879cbe832b640c07a24ee6941fa545928.tar.gz
scala-async-d7914c3879cbe832b640c07a24ee6941fa545928.tar.bz2
scala-async-d7914c3879cbe832b640c07a24ee6941fa545928.zip
Merge pull request #113 from retronym/backport/104
[backport] Avoid masking real errors with NotImplemented awaiting Future[Nothing]
Diffstat (limited to 'src/main')
-rw-r--r--src/main/scala/scala/async/internal/LiveVariables.scala2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main/scala/scala/async/internal/LiveVariables.scala b/src/main/scala/scala/async/internal/LiveVariables.scala
index 23063ba..79ba18e 100644
--- a/src/main/scala/scala/async/internal/LiveVariables.scala
+++ b/src/main/scala/scala/async/internal/LiveVariables.scala
@@ -56,7 +56,7 @@ trait LiveVariables {
// determine which fields should be live also at the end (will not be nulled out)
val noNull: Set[Symbol] = liftedSyms.filter { sym =>
- sym.tpe.typeSymbol.isPrimitiveValueClass || liftables.exists { tree =>
+ sym.tpe.typeSymbol.isPrimitiveValueClass || sym.tpe.typeSymbol == definitions.NothingClass || liftables.exists { tree =>
!liftedSyms.contains(tree.symbol) && tree.exists(_.symbol == sym)
}
}