Skip to content

Commit

Permalink
Simplify code and fix test failures
Browse files Browse the repository at this point in the history
  • Loading branch information
ppkarwasz committed Feb 24, 2024
1 parent 6500e37 commit 073b13f
Show file tree
Hide file tree
Showing 3 changed files with 36 additions and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,8 @@ public LoggerContext getContext(
return ctx;
}

private static void setEntry(final LoggerContext ctx, final Entry<String, Object> entry) {
private static void setEntry(
final org.apache.logging.log4j.spi.LoggerContext ctx, final Entry<String, Object> entry) {
if (entry != null) {
final String key = entry.getKey();
if (ctx.getObject(entry.getKey()) == null) {
Expand Down
17 changes: 17 additions & 0 deletions log4j-tomcat-juli-core/src/test/resources/dummy-log4j2.test
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
#
# Copyright © 2024 Piotr P. Karwasz
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
##
Dummy file to trigger custom configuration factory
17 changes: 17 additions & 0 deletions log4j-tomcat-juli-core/src/test/resources/dummy2-log4j2.test
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
#
# Copyright © 2024 Piotr P. Karwasz
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
##
Dummy file to trigger custom configuration factory

0 comments on commit 073b13f

Please sign in to comment.