Skip to content

NPE in IdeProcessingEnvImpl.replacePlaceholdersUsing() if Map entry has no value #4640 #4641

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Dec 2, 2025
+23 −4
Merged

NPE in IdeProcessingEnvImpl.replacePlaceholdersUsing() if Map entry has no value #4640 #4641

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
10b8309
NPE in IdeProcessingEnvImpl.replacePlaceholdersUsing() if Map entry has
jarthana Nov 19, 2025
3353f2a
Version bump(s) for 4.38 stream
eclipse-jdt-bot Nov 19, 2025
d652751
Version bump(s) for 4.39 stream
eclipse-jdt-bot Dec 1, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion org.eclipse.jdt.apt.pluggable.core/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.jdt.apt.pluggable.core;singleton:=true
Bundle-Version: 1.4.600.qualifier
Bundle-Version: 1.4.700.qualifier
Bundle-Activator: org.eclipse.jdt.internal.apt.pluggable.core.Apt6Plugin
Bundle-Vendor: %providerName
Require-Bundle: org.eclipse.core.runtime,
Expand Down
2 changes: 1 addition & 1 deletion ...e.core/src/org/eclipse/jdt/internal/apt/pluggable/core/dispatch/IdeProcessingEnvImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ public Map<String, String> getOptions() {

private Function<Entry<String, String>, String> replacePlaceholdersUsing(Map<String, String> commandLineOptions) {
return option -> {
String variable, replacement, optionValue = option.getValue();
String variable, replacement, optionValue = option.getValue() == null ? "" : option.getValue();
Matcher placeholder = Pattern.compile("%([^%]+)%").matcher(optionValue);
if (placeholder.find() && (variable = placeholder.group(1)) != null
&& (replacement = commandLineOptions.get(variable)) != null) {
Expand Down
2 changes: 1 addition & 1 deletion org.eclipse.jdt.apt.pluggable.tests/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.jdt.apt.pluggable.tests;singleton:=true
Bundle-Version: 3.6.800.qualifier
Bundle-Version: 3.6.900.qualifier
Bundle-Activator: org.eclipse.jdt.apt.pluggable.tests.Apt6TestsPlugin
Bundle-Localization: plugin
Require-Bundle: org.junit,
Expand Down
2 changes: 1 addition & 1 deletion org.eclipse.jdt.apt.pluggable.tests/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<relativePath>../tests-pom/</relativePath>
</parent>
<artifactId>org.eclipse.jdt.apt.pluggable.tests</artifactId>
<version>3.6.800-SNAPSHOT</version>
<version>3.6.900-SNAPSHOT</version>
<packaging>eclipse-test-plugin</packaging>
<properties>
<testSuite>${project.artifactId}</testSuite>
Expand Down
19 changes: 19 additions & 0 deletions ...eclipse.jdt.apt.pluggable.tests/src/org/eclipse/jdt/apt/pluggable/tests/BuilderTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -415,6 +415,25 @@ public void testBug341298() throws Throwable {
fullBuild();
assertTrue("Processor should be able to compile with passed options", Bug341298Processor.success());
}
public void testGHIssue4640() throws Throwable {
ProcessorTestStatus.reset();
IJavaProject project = createJavaProject(_projectName);
IPath root = project.getProject().getFullPath().append("src");
env.addClass(root, "test341298", "Annotated",
"package test341298;\n" +
"@Annotation public class Annotated {}"
);
env.addClass(root, "test341298", "Annotation",
"package test341298;\n" +
"public @interface Annotation {}"
);
AptConfig.addProcessorOption(project, "classpath", "%classpath%");
AptConfig.addProcessorOption(project, "sourcepath", "%sourcepath%");
AptConfig.addProcessorOption(project, "phase", null);
AptConfig.setEnabled(project, true);
fullBuild();
assertTrue("Processor should be able to compile with passed options", Bug341298Processor.success());
}

public void testBug539663() throws Throwable {
if (!canRunJava9()) {
Expand Down
Loading