Skip to content

Commit ec6ab6e

Browse files
committed
Restore extending classes
1 parent 512d2ec commit ec6ab6e

2 files changed

Lines changed: 20 additions & 16 deletions

File tree

java/org/apache/catalina/valves/AbstractAccessLogValve.java

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -876,7 +876,7 @@ protected static class ThreadNameElement implements AccessLogElement {
876876
/**
877877
* Constructs a new ThreadNameElement.
878878
*/
879-
ThreadNameElement() {
879+
public ThreadNameElement() {
880880
}
881881

882882
/**
@@ -1015,7 +1015,7 @@ protected class HostElement implements AccessLogElement, CachedElement {
10151015
/**
10161016
* Constructs a new HostElement.
10171017
*/
1018-
HostElement() {
1018+
public HostElement() {
10191019
}
10201020

10211021
/**
@@ -1064,7 +1064,7 @@ protected static class LogicalUserNameElement implements AccessLogElement {
10641064
/**
10651065
* Constructs a new LogicalUserNameElement.
10661066
*/
1067-
LogicalUserNameElement() {
1067+
public LogicalUserNameElement() {
10681068
}
10691069

10701070
/**
@@ -1089,7 +1089,7 @@ protected class ProtocolElement implements AccessLogElement {
10891089
/**
10901090
* Constructs a new ProtocolElement.
10911091
*/
1092-
ProtocolElement() {
1092+
public ProtocolElement() {
10931093
}
10941094

10951095
/**
@@ -1123,7 +1123,7 @@ protected static class UserElement implements AccessLogElement {
11231123
/**
11241124
* Constructs a new UserElement.
11251125
*/
1126-
UserElement() {
1126+
public UserElement() {
11271127
}
11281128

11291129
/**
@@ -1199,7 +1199,7 @@ protected class DateAndTimeElement implements AccessLogElement {
11991199
/**
12001200
* Creates a new date and time element using CLF format.
12011201
*/
1202-
protected DateAndTimeElement() {
1202+
public DateAndTimeElement() {
12031203
this(null);
12041204
}
12051205

@@ -1237,7 +1237,7 @@ private String tidyFormat(String format) {
12371237
*
12381238
* @param sdf The SimpleDateFormat pattern or special format identifier
12391239
*/
1240-
protected DateAndTimeElement(String sdf) {
1240+
public DateAndTimeElement(String sdf) {
12411241
String format = sdf;
12421242
boolean needsEscaping = false;
12431243
if (sdf != null) {
@@ -1345,7 +1345,7 @@ protected static class RequestElement implements AccessLogElement {
13451345
/**
13461346
* Constructs a new RequestElement.
13471347
*/
1348-
RequestElement() {
1348+
public RequestElement() {
13491349
}
13501350

13511351
/**
@@ -1385,7 +1385,7 @@ protected static class HttpStatusCodeElement implements AccessLogElement {
13851385
/**
13861386
* Constructs a new HttpStatusCodeElement.
13871387
*/
1388-
HttpStatusCodeElement() {
1388+
public HttpStatusCodeElement() {
13891389
}
13901390

13911391
/**
@@ -1534,7 +1534,7 @@ protected static class MethodElement implements AccessLogElement {
15341534
/**
15351535
* Constructs a new MethodElement.
15361536
*/
1537-
MethodElement() {
1537+
public MethodElement() {
15381538
}
15391539

15401540
/**
@@ -1663,7 +1663,7 @@ protected static class FirstByteTimeElement implements AccessLogElement {
16631663
/**
16641664
* Constructs a new FirstByteTimeElement.
16651665
*/
1666-
FirstByteTimeElement() {
1666+
public FirstByteTimeElement() {
16671667
}
16681668

16691669
/**
@@ -1694,7 +1694,7 @@ protected static class QueryElement implements AccessLogElement {
16941694
/**
16951695
* Constructs a new QueryElement.
16961696
*/
1697-
QueryElement() {
1697+
public QueryElement() {
16981698
}
16991699

17001700
/**
@@ -1747,7 +1747,7 @@ protected static class SessionIdElement implements AccessLogElement {
17471747
/**
17481748
* Constructs a new SessionIdElement.
17491749
*/
1750-
SessionIdElement() {
1750+
public SessionIdElement() {
17511751
}
17521752

17531753
/**
@@ -1781,7 +1781,7 @@ protected static class RequestURIElement implements AccessLogElement {
17811781
/**
17821782
* Constructs a new RequestURIElement.
17831783
*/
1784-
RequestURIElement() {
1784+
public RequestURIElement() {
17851785
}
17861786

17871787
/**
@@ -1810,7 +1810,7 @@ protected class LocalServerNameElement implements AccessLogElement {
18101810
/**
18111811
* Constructs a new LocalServerNameElement.
18121812
*/
1813-
LocalServerNameElement() {
1813+
public LocalServerNameElement() {
18141814
}
18151815

18161816
/**
@@ -2051,7 +2051,7 @@ protected static class ConnectionStatusElement implements AccessLogElement {
20512051
/**
20522052
* Constructs a new ConnectionStatusElement.
20532053
*/
2054-
ConnectionStatusElement() {
2054+
public ConnectionStatusElement() {
20552055
}
20562056

20572057
/**

webapps/docs/changelog.xml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -229,6 +229,10 @@
229229
<fix>
230230
Avoid NPE in RewriteValve. (markt)
231231
</fix>
232+
<fix>
233+
Restore ability to extend many element classes from
234+
<code>AbstractAccessLogValve</code>. (remm)
235+
</fix>
232236
</changelog>
233237
</subsection>
234238
<subsection name="Coyote">

0 commit comments

Comments
 (0)