Skip to content

Commit d8d0387

Browse files
committed
bugfix
1 parent 14d9927 commit d8d0387

File tree

2 files changed

+14
-5
lines changed

2 files changed

+14
-5
lines changed

src/main/java/org/jvnet/hudson/plugins/collapsingconsolesections/CollapsingSectionAnnotator.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,8 @@ public ConsoleAnnotator annotate(Object context, MarkupText text) {
6464
return null;
6565
}
6666

67-
SectionDefinition currentSection = currentSections.peek();
6867
while (!currentSections.empty()) {
68+
SectionDefinition currentSection = currentSections.peek();
6969
if (currentSection.getSectionEndPattern().matcher(text.getText().trim()).matches()) {
7070
popSection(text);
7171
if (currentSection.isCollapseOnlyOneLevel()) {
@@ -74,11 +74,12 @@ public ConsoleAnnotator annotate(Object context, MarkupText text) {
7474
} else {
7575
break;
7676
}
77-
currentSection = currentSections.peek();
7877
}
7978

8079
for (SectionDefinition section : sections) {
81-
if(currentSection.getSectionDisplayName().equals(section.getSectionDisplayName()) && !section.isAllowNesting()) {
80+
if(!currentSections.empty()
81+
&& currentSections.peek().getSectionDisplayName().equals(section.getSectionDisplayName())
82+
&& !section.isAllowNesting()) {
8283
continue;
8384
}
8485
Matcher m = section.getSectionStartPattern().matcher(text.getText().trim());

src/main/java/org/jvnet/hudson/plugins/collapsingconsolesections/SectionDefinition.java

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,20 +43,28 @@ public class SectionDefinition implements Serializable {
4343
private boolean allowNesting;
4444

4545
/**
46-
* @deprecated Use {@link #SectionDefinition(java.lang.String, java.lang.String, java.lang.String, boolean, boolean)} instead.
46+
* @deprecated Use {@link #SectionDefinition(java.lang.String, java.lang.String, java.lang.String, boolean, boolean, boolean)} instead.
4747
*/
4848
@Deprecated
4949
public SectionDefinition(String sectionName, String sectionStartPattern, String sectionEndPattern) {
5050
this(sectionName, sectionStartPattern, sectionEndPattern, false, false, false);
5151
}
5252

5353
/**
54-
* @deprecated Use {@link #SectionDefinition(java.lang.String, java.lang.String, java.lang.String, boolean, boolean)} instead.
54+
* @deprecated Use {@link #SectionDefinition(java.lang.String, java.lang.String, java.lang.String, boolean, boolean, boolean)} instead.
5555
*/
5656
@Deprecated
5757
public SectionDefinition(String sectionName, String sectionStartPattern, String sectionEndPattern, boolean collapseOnlyOneLevel) {
5858
this(sectionName, sectionStartPattern, sectionEndPattern, collapseOnlyOneLevel, false, false);
5959
}
60+
61+
/**
62+
* @deprecated Use {@link #SectionDefinition(java.lang.String, java.lang.String, java.lang.String, boolean, boolean, boolean)} instead.
63+
*/
64+
@Deprecated
65+
public SectionDefinition(String sectionName, String sectionStartPattern, String sectionEndPattern, boolean collapseOnlyOneLevel, boolean collapseSection) {
66+
this(sectionName, sectionStartPattern, sectionEndPattern, collapseOnlyOneLevel, collapseSection, false);
67+
}
6068

6169
/**
6270
* Creates a new section definition.

0 commit comments

Comments
 (0)