Fix constant pool

m3m0r7 · m3m0r7 · commit f41a975c9a0e · 2019-04-28T15:06:42.000+09:00
diff --git a/src/Core/JVM/Invoker/Invokable.php b/src/Core/JVM/Invoker/Invokable.php
@@ -298,12 +298,12 @@ function ($item) {
              */
             $executor = OperationCache::fetchOrPush(
                 $fullName,
-                function () use ($fullName, &$currentConstantPool) {
-                    return (new $fullName())
-                        ->setConstantPool($currentConstantPool);
+                function () use ($fullName) {
+                    return new $fullName();
                 }
             );
             $returnValue = $executor
+                ->setConstantPool($currentConstantPool)
                 ->setParameters(
                     $method->getAttributes(),
                     $this->javaClassInvoker,
diff --git a/src/Kernel/Core/Accumulator.php b/src/Kernel/Core/Accumulator.php
@@ -37,7 +37,7 @@ public function setParameters(
         \PHPJava\Core\JVM\Stream\BinaryReader $reader,
         array &$localStorage,
         array &$stacks,
-        int &$pointer
+        int $pointer
     ): self {
         $this->attributes = &$attributes;
         $this->javaClassInvoker = &$javaClassInvoker;
@@ -46,7 +46,7 @@ public function setParameters(
         $this->reader = &$reader;
         $this->localStorage = &$localStorage;
         $this->stacks = &$stacks;
-        $this->pointer = &$pointer;
+        $this->pointer = $pointer;
         return $this;
     }
 
