Reword IO::CatHandles.handles to workaround JVM bug

d5baa03#commitcomment-27783688
rakudo · Feb 26, 2018 · eb06492 · eb06492
1 parent 8a10fc1
commit eb06492
Showing 1 changed file with 6 additions and 7 deletions.
diff --git a/src/core/IO/CatHandle.pm b/src/core/IO/CatHandle.pm
@@ -107,15 +107,14 @@ my class IO::CatHandle is IO::Handle {
                 nqp::if(
                   $!gave-active,
                   nqp::if(
-                    nqp::eqaddr((my $h := $!cat.next-handle), Nil),
-                    IterationEnd,
-                    $h),
+                    nqp::defined(my $h := $!cat.next-handle),
+                    $h,
+                    IterationEnd),
                   nqp::stmts(
                     ($!gave-active := True),
-                    nqp::eqaddr(
-                      (my $ah := nqp::decont(nqp::getattr($!cat, IO::CatHandle,
-                        '$!active-handle'))),
-                      Nil) ?? IterationEnd !! $ah))
+                    nqp::defined(my $ah := nqp::decont(
+                      nqp::getattr($!cat, IO::CatHandle, '$!active-handle')))
+                    ?? $ah !! IterationEnd))
             }
         }.new: self
     }