From 97ca7b99ee1e77cb8d20932843154714105e85ea Mon Sep 17 00:00:00 2001 From: nikhil-mittal-165 Date: Thu, 12 Nov 2026 17:46:37 +0530 Subject: [PATCH 1/3] fix: wait for stderr to drain before parsing java version Co-Authored-By: Claude Sonnet 5.5 --- .../src/JavaVersionIdentifier.ts | 3 ++- .../test/JavaVersionIdentifier.test.ts | 23 +++++++++++++++++++ 2 files changed, 25 insertions(+), 1 deletion(-) diff --git a/packages/code-analyzer-pmd-engine/src/JavaVersionIdentifier.ts b/packages/code-analyzer-pmd-engine/src/JavaVersionIdentifier.ts index 023f44b3..49ed6931 100644 --- a/packages/code-analyzer-pmd-engine/src/JavaVersionIdentifier.ts +++ b/packages/code-analyzer-pmd-engine/src/JavaVersionIdentifier.ts @@ -30,7 +30,8 @@ export class RuntimeJavaVersionIdentifier implements JavaVersionIdentifier { childProcess.stderr.on('data', (data: Buffer) => { stderr += data.toString(); }); - childProcess.on('exit', (code: number) => { + // We listen to 'close' (not 'exit') so that stderr is fully drained before we parse it. + childProcess.on('close', (code: number|null) => { /* istanbul ignore else */ if (code === 0) { // Oddly enough the -version command is documented to go to stderr and not stdout diff --git a/packages/code-analyzer-pmd-engine/test/JavaVersionIdentifier.test.ts b/packages/code-analyzer-pmd-engine/test/JavaVersionIdentifier.test.ts index cf8be0be..47cb6205 100644 --- a/packages/code-analyzer-pmd-engine/test/JavaVersionIdentifier.test.ts +++ b/packages/code-analyzer-pmd-engine/test/JavaVersionIdentifier.test.ts @@ -12,6 +12,19 @@ function stubJavaProcess(stderrLine: string, exitCode: number = 0): cp.ChildProc process.nextTick(() => { child.stderr.emit('data', Buffer.from(stderrLine)); child.emit('exit', exitCode); + child.emit('close', exitCode); + }); + return child as unknown as cp.ChildProcessWithoutNullStreams; +} + +// Simulates stdio still being open at 'exit': the remaining stderr only arrives before 'close'. +function stubJavaProcessWithLateStderr(firstChunk: string, lateChunk: string): cp.ChildProcessWithoutNullStreams { + const child = Object.assign(new EventEmitter(), {stderr: new EventEmitter()}); + process.nextTick(() => { + child.stderr.emit('data', Buffer.from(firstChunk)); + child.emit('exit', 0); + child.stderr.emit('data', Buffer.from(lateChunk)); + child.emit('close', 0); }); return child as unknown as cp.ChildProcessWithoutNullStreams; } @@ -70,4 +83,14 @@ describe('RuntimeJavaVersionIdentifier CWE-427 regression', () => { expect(version?.toString()).toEqual('11.0.6'); expect(spawnSpy).toHaveBeenCalledWith('java', ['-version'], {cwd: TRUSTED_DIR}); }); + + it('waits for stderr to be fully drained (close) before parsing, even with JAVA_TOOL_OPTIONS notice first', async () => { + jest.spyOn(cp, 'spawn').mockImplementation(() => stubJavaProcessWithLateStderr( + 'Picked up JAVA_TOOL_OPTIONS: -Dfile.encoding=UTF-8\n', + 'openjdk version "17.0.11" 2024-04-16 LTS\n')); + + const version = await new RuntimeJavaVersionIdentifier().identifyJavaVersion('java'); + + expect(version?.toString()).toEqual('17.0.11'); + }); }); From bb81b740c463da0ae0b581ba9ac22faf10a3c5ef Mon Sep 17 00:00:00 2001 From: Nikhil Mittal Date: Thu, 12 Nov 2026 18:07:37 +0530 Subject: [PATCH 2/3] Empty commit to retrigger CI Co-Authored-By: Claude Sonnet 5.5 From 3b88c60734d3e4ec986af9dad5ce3fbeb5386c53 Mon Sep 17 00:00:00 2001 From: Nikhil Mittal Date: Thu, 12 Nov 2026 18:13:24 +0530 Subject: [PATCH 3/3] Bump code-analyzer-pmd-engine to 0.47.0-SNAPSHOT Co-Authored-By: Claude Sonnet 5.5 --- packages/code-analyzer-pmd-engine/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/code-analyzer-pmd-engine/package.json b/packages/code-analyzer-pmd-engine/package.json index 0fc9325e..e045e4a1 100644 --- a/packages/code-analyzer-pmd-engine/package.json +++ b/packages/code-analyzer-pmd-engine/package.json @@ -1,7 +1,7 @@ { "name": "@salesforce/code-analyzer-pmd-engine", "description": "Plugin package that adds 'pmd' and 'cpd' as engines into Salesforce Code Analyzer", - "version": "0.46.0", + "version": "0.47.0-SNAPSHOT", "author": "The Salesforce Code Analyzer Team", "license": "BSD-3-Clause", "homepage": "https://developer.salesforce.com/docs/platform/salesforce-code-analyzer/overview",