Skip to content

Commit 8926155

Browse files
committed
Preserve initialization options stored inside Preferences.
- Also implement better workaround for JAXP limits on JDK24 Signed-off-by: Roland Grunberg <rgrunber@redhat.com>
1 parent 2442b53 commit 8926155

File tree

3 files changed

+8
-2
lines changed

3 files changed

+8
-2
lines changed

.github/workflows/codeql-analysis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ jobs:
7272
# echo "Run, Build Application using script"
7373
# ./location_of_script_within_repo/buildscript.sh
7474
- name: Manual build
75-
run: ./mvnw clean package -f "pom.xml" -B -V -e -Dfindbugs.skip -Dcheckstyle.skip -Dpmd.skip=true -Dspotbugs.skip -Denforcer.skip -Dmaven.javadoc.skip -DskipTests -Dmaven.test.skip.exec -Dlicense.skip=true -Drat.skip=true -Dspotless.check.skip=true -Djdk.xml.maxGeneralEntitySizeLimit=1000000 -Djdk.xml.totalEntitySizeLimit=1000000
75+
run: ./mvnw clean package -f "pom.xml" -B -V -e -Dfindbugs.skip -Dcheckstyle.skip -Dpmd.skip=true -Dspotbugs.skip -Denforcer.skip -Dmaven.javadoc.skip -DskipTests -Dmaven.test.skip.exec -Dlicense.skip=true -Drat.skip=true -Dspotless.check.skip=true
7676

7777

7878
- name: Perform CodeQL Analysis

.mvn/jvm.config

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
-Djdk.xml.maxGeneralEntitySizeLimit=1000000 -Djdk.xml.totalEntitySizeLimit=1000000

org.eclipse.jdt.ls.core/src/org/eclipse/jdt/ls/core/internal/preferences/PreferenceManager.java

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -226,7 +226,12 @@ private static boolean updateTemplate(String templateId, String content) {
226226
public void update(Map<String, Object> preferences) {
227227
Map<String, Object> currMap = this.preferences.asMap();
228228
currMap.putAll(preferences);
229-
update(Preferences.createFrom(currMap));
229+
Preferences newPreferences = Preferences.createFrom(currMap);
230+
// Preserve preferences stored here that are never sent after initialization
231+
newPreferences.setRootPaths(this.preferences.getRootPaths());
232+
newPreferences.setTriggerFiles(this.preferences.getTriggerFiles());
233+
newPreferences.setProjectConfigurations(this.preferences.getProjectConfigurations());
234+
update(newPreferences);
230235
}
231236

232237
public void update(Preferences preferences) {

0 commit comments

Comments
 (0)