bugfix

jenkinsci · Apr 9, 2024 · 73c878f · 73c878f
1 parent 561972c
commit 73c878f
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 5 deletions.
diff --git a/...n/java/org/jvnet/hudson/plugins/collapsingconsolesections/CollapsingSectionAnnotator.java b/...n/java/org/jvnet/hudson/plugins/collapsingconsolesections/CollapsingSectionAnnotator.java
@@ -64,8 +64,8 @@ public ConsoleAnnotator annotate(Object context, MarkupText text) {
             return null;
         }
 
-        SectionDefinition currentSection = currentSections.peek();
         while (!currentSections.empty()) {
+          SectionDefinition currentSection = currentSections.peek();
             if (currentSection.getSectionEndPattern().matcher(text.getText().trim()).matches()) {
                 popSection(text);
                 if (currentSection.isCollapseOnlyOneLevel()) {
@@ -74,11 +74,12 @@ public ConsoleAnnotator annotate(Object context, MarkupText text) {
             } else {
                 break;
             }
-            currentSection = currentSections.peek();
         }
 
         for (SectionDefinition section : sections) {
-            if(currentSection.getSectionDisplayName().equals(section.getSectionDisplayName()) && !section.isAllowNesting()) {
+            if(!currentSections.empty()
+                && currentSections.peek().getSectionDisplayName().equals(section.getSectionDisplayName())
+                && !section.isAllowNesting()) {
                 continue;
             }
             Matcher m = section.getSectionStartPattern().matcher(text.getText().trim());

diff --git a/src/main/java/org/jvnet/hudson/plugins/collapsingconsolesections/SectionDefinition.java b/src/main/java/org/jvnet/hudson/plugins/collapsingconsolesections/SectionDefinition.java
@@ -43,20 +43,28 @@ public class SectionDefinition implements Serializable {
     private boolean allowNesting;
 
     /**
-     * @deprecated Use {@link #SectionDefinition(java.lang.String, java.lang.String, java.lang.String, boolean, boolean)} instead.
+     * @deprecated Use {@link #SectionDefinition(java.lang.String, java.lang.String, java.lang.String, boolean, boolean, boolean)} instead.
      */
     @Deprecated
     public SectionDefinition(String sectionName, String sectionStartPattern, String sectionEndPattern) {
         this(sectionName, sectionStartPattern, sectionEndPattern, false, false, false);
     }
 
     /**
-     * @deprecated Use {@link #SectionDefinition(java.lang.String, java.lang.String, java.lang.String, boolean, boolean)} instead.
+     * @deprecated Use {@link #SectionDefinition(java.lang.String, java.lang.String, java.lang.String, boolean, boolean, boolean)} instead.
      */
     @Deprecated
     public SectionDefinition(String sectionName, String sectionStartPattern, String sectionEndPattern, boolean collapseOnlyOneLevel) {
         this(sectionName, sectionStartPattern, sectionEndPattern, collapseOnlyOneLevel, false, false);
     }
+
+    /**
+     * @deprecated Use {@link #SectionDefinition(java.lang.String, java.lang.String, java.lang.String, boolean, boolean, boolean)} instead.
+     */
+    @Deprecated
+    public SectionDefinition(String sectionName, String sectionStartPattern, String sectionEndPattern, boolean collapseOnlyOneLevel, boolean collapseSection) {
+        this(sectionName, sectionStartPattern, sectionEndPattern, collapseOnlyOneLevel, collapseSection, false);
+    }
 
     /**
      * Creates a new section definition.