diff options
| author | Jason Zaugg <jzaugg@gmail.com> | 2017-12-01 16:04:43 +1000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-01 16:04:43 +1000 |
| commit | 0a7ed0eca33fc5f75970d31ea785d2aa0ff1806d (patch) | |
| tree | bdf7bdb2fdfde7dc47859a921d91773428fe6216 | |
| parent | 1802797d7485bcd68feef792817102884edd8abf (diff) | |
| parent | 46cd615ea659ca008d163afc88d179147fbc9fac (diff) | |
| download | scala-async-0a7ed0eca33fc5f75970d31ea785d2aa0ff1806d.tar.gz scala-async-0a7ed0eca33fc5f75970d31ea785d2aa0ff1806d.tar.bz2 scala-async-0a7ed0eca33fc5f75970d31ea785d2aa0ff1806d.zip | |
Merge pull request #182 from retronym/null-check
Avoid NPE with import trees
| -rw-r--r-- | src/main/scala/scala/async/internal/TransformUtils.scala | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main/scala/scala/async/internal/TransformUtils.scala b/src/main/scala/scala/async/internal/TransformUtils.scala index 04adf20..98f84dd 100644 --- a/src/main/scala/scala/async/internal/TransformUtils.scala +++ b/src/main/scala/scala/async/internal/TransformUtils.scala @@ -528,7 +528,7 @@ private[async] trait TransformUtils { def addUncheckedBounds(t: Tree) = { typingTransform(t, owner) { (tree, api) => - internal.setType(api.default(tree), uncheckedBoundsIfNeeded(tree.tpe)) + if (tree.tpe == null) tree else internal.setType(api.default(tree), uncheckedBoundsIfNeeded(tree.tpe)) } } |