Skip to content
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.

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

Issue #11312 - fix deprecated init-param detection in DefaultServlet #11314

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -330,13 +330,13 @@ private static ByteBufferPool getByteBufferPool(ContextHandler contextHandler)

private String getInitParameter(String name, String... deprecated)
{
String value = super.getInitParameter(name);
String value = getInitParameter(name);
if (value != null)
return value;

for (String d : deprecated)
{
value = super.getInitParameter(d);
value = getInitParameter(d);
if (value != null)
{
LOG.warn("Deprecated {} used instead of {}", d, name);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -317,13 +317,13 @@ private static ByteBufferPool getByteBufferPool(ContextHandler contextHandler)

private String getInitParameter(String name, String... deprecated)
{
String value = super.getInitParameter(name);
String value = getInitParameter(name);
if (value != null)
return value;

for (String d : deprecated)
{
value = super.getInitParameter(d);
value = getInitParameter(d);
if (value != null)
{
LOG.warn("Deprecated {} used instead of {}", d, name);
Expand Down