diff options
| author | Janek Bogucki <janekdb@gmail.com> | 2015-08-04 08:45:58 +0100 |
|---|---|---|
| committer | Janek Bogucki <janekdb@gmail.com> | 2015-08-04 08:45:58 +0100 |
| commit | 58ae3e51f7d0ac0f4a56deaab5f90ab5048350fe (patch) | |
| tree | a714df8b46e44f8537bc6f1b5ac11e056ebad488 /src/reflect | |
| parent | a745f06e35e070061348e95725afb0def8ca45de (diff) | |
| download | scala-58ae3e51f7d0ac0f4a56deaab5f90ab5048350fe.tar.gz scala-58ae3e51f7d0ac0f4a56deaab5f90ab5048350fe.tar.bz2 scala-58ae3e51f7d0ac0f4a56deaab5f90ab5048350fe.zip | |
Delegate null test to Option
Option(null) is None while Option(v) is Some(v) which makes the null
test redundant.
Diffstat (limited to 'src/reflect')
| -rw-r--r-- | src/reflect/scala/reflect/runtime/TwoWayCache.scala | 3 | ||||
| -rw-r--r-- | src/reflect/scala/reflect/runtime/TwoWayCaches.scala | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/src/reflect/scala/reflect/runtime/TwoWayCache.scala b/src/reflect/scala/reflect/runtime/TwoWayCache.scala index d0fc3dac74..6c1ca5b571 100644 --- a/src/reflect/scala/reflect/runtime/TwoWayCache.scala +++ b/src/reflect/scala/reflect/runtime/TwoWayCache.scala @@ -26,8 +26,7 @@ private[runtime] class TwoWayCache[J, S] { private object SomeRef { def unapply[T](optRef: Option[WeakReference[T]]): Option[T] = if (optRef.nonEmpty) { - val result = optRef.get.get - if (result != null) Some(result) else None + Option(optRef.get.get) } else None } diff --git a/src/reflect/scala/reflect/runtime/TwoWayCaches.scala b/src/reflect/scala/reflect/runtime/TwoWayCaches.scala index 6e2890e536..6ce0c0a728 100644 --- a/src/reflect/scala/reflect/runtime/TwoWayCaches.scala +++ b/src/reflect/scala/reflect/runtime/TwoWayCaches.scala @@ -26,8 +26,7 @@ private[runtime] trait TwoWayCaches { self: SymbolTable => private object SomeRef { def unapply[T](optRef: Option[WeakReference[T]]): Option[T] = if (optRef.nonEmpty) { - val result = optRef.get.get - if (result != null) Some(result) else None + Option(optRef.get.get) } else None } |