jolie · fmontesi · Jul 25, 2025 · Jul 14, 2025 · Jul 16, 2025 · Jul 17, 2025
diff --git a/javaServices/coreJavaServices/src/main/java/joliex/io/ConsoleService.java b/javaServices/coreJavaServices/src/main/java/joliex/io/ConsoleService.java
@@ -24,6 +24,7 @@
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStreamReader;
+import java.lang.ref.Cleaner;
 import java.nio.channels.Channels;
 import java.nio.channels.ClosedByInterruptException;
 import java.text.SimpleDateFormat;
@@ -43,7 +44,7 @@ public class ConsoleService extends JavaService {
 	private String timestampFormat = TIMESTAMP_DEFAULT_FORMAT;
 
 	private class ConsoleInputThread extends Thread {
-		private boolean keepRun = true;
+		private volatile boolean keepRun = true;
 
 		public void kill() {
 			keepRun = false;
@@ -81,6 +82,7 @@ public void run() {
 	}
 
 	private ConsoleInputThread consoleInputThread;
+	private final Cleaner cleaner = Cleaner.create();
 
 	@RequestResponse
 	public void registerForInput( Value request ) {
@@ -91,19 +93,10 @@ public void registerForInput( Value request ) {
 			}
 		}
 		consoleInputThread = new ConsoleInputThread();
+		cleaner.register( consoleInputThread, consoleInputThread::kill );
 		consoleInputThread.start();
 	}
 
-	@Override
-	protected void finalize()
-		throws Throwable {
-		try {
-			consoleInputThread.kill();
-		} finally {
-			super.finalize();
-		}
-	}
-
 	@RequestResponse
 	public void print( String s ) {
 		if( enableTimestamp ) {

diff --git a/javaServices/coreJavaServices/src/main/java/joliex/util/TimeService.java b/javaServices/coreJavaServices/src/main/java/joliex/util/TimeService.java
@@ -22,6 +22,7 @@
 package joliex.util;
 
 
+import java.lang.ref.Cleaner;
 import java.text.DateFormat;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
@@ -70,6 +71,8 @@ public Interpreter interpreter() {
 	}
 
 	private TimeThread thread = null;
+	private final Cleaner cleaner = Cleaner.create();
+
 	private final DateFormat dateFormat, dateTimeFormat;
 	private final ScheduledExecutorService executor = Executors.newSingleThreadScheduledExecutor();
 	private final Map< Long, ScheduledFuture< ? > > scheduledFutureHashMap = new ConcurrentHashMap<>();
@@ -80,24 +83,13 @@ public TimeService() {
 		dateTimeFormat = DateFormat.getDateTimeInstance( DateFormat.SHORT, DateFormat.MEDIUM );
 	}
 
-	@Override
-	protected void finalize()
-		throws Throwable {
-		try {
-			if( thread != null ) {
-				thread.interrupt();
-			}
-		} finally {
-			super.finalize();
-		}
-	}
-
 	private void launchTimeThread( long waitTime, String callbackOperation, Value callbackValue ) {
 		waitTime = (waitTime > 0) ? waitTime : 0L;
 		if( thread != null ) {
 			thread.interrupt();
 		}
 		thread = new TimeThread( this, waitTime, callbackOperation, callbackValue );
+		cleaner.register( thread, thread::interrupt );
 		thread.start();
 	}
 

diff --git a/jolie/src/main/java/jolie/Interpreter.java b/jolie/src/main/java/jolie/Interpreter.java
@@ -271,7 +271,7 @@ public CorrelationSet correlationInitializer() {
 	private final String logPrefix;
 	private final Tracer tracer;
 
-	private boolean check = false;
+	private volatile boolean check = false;
 	private static final long PERSISTENT_CONNECTION_TIMEOUT = 2 * 1000; // 2 seconds
 	private static final long AWAIT_TERMINATION_TIMEOUT = 5 * 1000; // 5 seconds
 
@@ -561,12 +561,10 @@ public void exit() {
 	 * @param terminationTimeout the timeout for the wait of the termination of running processes
 	 */
 	public void exit( long terminationTimeout ) {
-		synchronized( this ) {
-			if( exiting ) {
-				return;
-			} else {
-				exiting = true;
-			}
+		if( exiting ) {
+			return;
+		} else {
+			exiting = true;
 		}
 		exitingLock.lock();
 		try {

diff --git a/jolie/src/main/java/jolie/net/SocketCommChannel.java b/jolie/src/main/java/jolie/net/SocketCommChannel.java
@@ -117,7 +117,9 @@ protected void sendImpl( CommMessage message )
 		throws IOException {
 		try {
 			protocol().send( ostream, message, istream );
-			ostream.flush();
+			if( socketChannel.isOpen() ) {
+				ostream.flush();
+			}
 		} catch( IllegalBlockingModeException e ) {
 			throw new IOException( e );
 		}

diff --git a/libjolie/src/main/java/jolie/lang/parse/module/JapSource.java b/libjolie/src/main/java/jolie/lang/parse/module/JapSource.java
@@ -87,13 +87,16 @@ public JapSource( URI uri ) throws FileNotFoundException {
 				if( manifest != null ) {
 					// See if a main program is defined through a Manifest attribute
 					Attributes attrs = manifest.getMainAttributes();
-					this.filePath = attrs.getValue( Constants.Manifest.MAIN_PROGRAM );
-					this.moduleEntry = japFile.getEntry( this.filePath );
+					if( attrs.containsKey( Constants.Manifest.MAIN_PROGRAM ) ) {
+						this.filePath = attrs.getValue( Constants.Manifest.MAIN_PROGRAM );
+					} else {
+						this.filePath = Paths.get( this.japFile.getName() ).toUri().toString() + ".ol";
+					}
 				} else {
 					// guess by name
 					this.filePath = Paths.get( this.japFile.getName() ).toUri().toString() + ".ol";
-					this.moduleEntry = this.japFile.getEntry( this.filePath );
 				}
+				this.moduleEntry = this.japFile.getEntry( this.filePath );
 			}
 			if( this.moduleEntry == null ) {
 				throw new FileNotFoundException( uri.toString() );

diff --git a/test/services/jester.ol b/test/services/jester.ol
@@ -139,9 +139,6 @@ define doTest {
 
     getJesterConfig@JesterConfigurator( jester )( config );
 
-
-    println@Console( s )()
-
     loadEmbeddedService@Runtime( { .filepath = "-C DEBUG=false" +
                                                 " -C API_ROUTER_HTTP=\"socket://" + router_host  + 
                                                 "\" -C API_ROUTER_HTTPS=\"local"  +