[GR-60813] Fix use of name in CompilerDaemon logging.

PullRequest: mx/1866
graalvm · Jan 3, 2025 · 16a76c5 · 16a76c5
2 parents b1f5550 + ac21ff0
commit 16a76c5
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/java/com.oracle.mxtool.jacoco/src/com/oracle/mxtool/jacoco/JacocoReport.java b/java/com.oracle.mxtool.jacoco/src/com/oracle/mxtool/jacoco/JacocoReport.java
@@ -278,9 +278,13 @@ private class JaCoCoAnalyzer extends Analyzer {
 
         @Override
         public void analyzeClass(byte[] buffer, String location) throws IOException {
-            final ClassReader reader = new ClassReader(buffer);
-            if (!isClassExcluded(reader.getClassName())) {
-                super.analyzeClass(buffer, location);
+            try {
+                final ClassReader reader = new ClassReader(buffer);
+                if (!isClassExcluded(reader.getClassName())) {
+                    super.analyzeClass(buffer, location);
+                }
+            } catch (Throwable e) {
+                throw new RuntimeException("Error processing " + location, e);
             }
         }
     }

diff --git a/src/mx/_impl/mx.py b/src/mx/_impl/mx.py
@@ -7765,7 +7765,7 @@ def redirect(stream):
 
         # wait 30 seconds for the Java process to launch and report the port number
         retries = 0
-        myself = f"{self.name}[{p.pid}]"
+        myself = f"{self.name()}[{p.pid}]"
         while self.port is None:
             retries = retries + 1
             returncode = p.poll()
@@ -18367,7 +18367,7 @@ def alarm_handler(signum, frame):
 _CACHE_DIR = get_env('MX_CACHE_DIR', join(dot_mx_dir(), 'cache'))
 
 # The version must be updated for every PR (checked in CI) and the comment should reflect the PR's issue
-version = VersionSpec("7.37.0")  # GR-60266 Implement time limit for mx unit tests
+version = VersionSpec("7.37.1")  # GR-60813 CompilerDaemon logging uses wrong name
 
 _mx_start_datetime = datetime.utcnow()