From 3e1ca69c91459b201210bb68e3f6915335af7a8c Mon Sep 17 00:00:00 2001 From: Mikhail Dzianishchyts Date: Mon, 17 Aug 2026 11:47:37 +0300 Subject: [PATCH] Prevent JShell from unnecessarily redefining wrappers because of extra newlines --- .../src/test/java/org/dflib/jjava/distro/KernelExecutionIT.java | 2 -- .../java/org/dflib/jjava/kernel/execution/CodeEvaluator.java | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/jjava-distro/src/test/java/org/dflib/jjava/distro/KernelExecutionIT.java b/jjava-distro/src/test/java/org/dflib/jjava/distro/KernelExecutionIT.java index 05bcb8c..1c1d68a 100644 --- a/jjava-distro/src/test/java/org/dflib/jjava/distro/KernelExecutionIT.java +++ b/jjava-distro/src/test/java/org/dflib/jjava/distro/KernelExecutionIT.java @@ -1,6 +1,5 @@ package org.dflib.jjava.distro; -import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -12,7 +11,6 @@ public class KernelExecutionIT extends ContainerizedKernelCase { * scenario passes even with the bug present. */ @Test - @Disabled public void variableSurvivesLaterImports() throws Exception { KernelRun run = executeInKernel( "%maven com.fasterxml.jackson.core:jackson-databind:2.21.2", diff --git a/jjava-kernel/src/main/java/org/dflib/jjava/kernel/execution/CodeEvaluator.java b/jjava-kernel/src/main/java/org/dflib/jjava/kernel/execution/CodeEvaluator.java index 9b93b85..e03b0ec 100644 --- a/jjava-kernel/src/main/java/org/dflib/jjava/kernel/execution/CodeEvaluator.java +++ b/jjava-kernel/src/main/java/org/dflib/jjava/kernel/execution/CodeEvaluator.java @@ -89,7 +89,7 @@ public Object eval(JShell shell, String code) { protected Object evalSingle(JShell shell, String code) { - List events = shell.eval(code); + List events = shell.eval(code.strip()); Object result = null;