More accurate class name. Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/5ab660e3 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/5ab660e3 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/5ab660e3
Branch: refs/heads/LOG4J-1181 Commit: 5ab660e3063d6680a1f964c4a4d658b0245cf792 Parents: c70c4f2 Author: ggregory <[email protected]> Authored: Mon Nov 2 02:57:14 2015 -0800 Committer: ggregory <[email protected]> Committed: Mon Nov 2 02:57:14 2015 -0800 ---------------------------------------------------------------------- .../net/server/AbstractSocketServerTest.java | 4 +-- .../log4j/core/net/server/ThreadFilter.java | 36 -------------------- .../log4j/core/net/server/ThreadNameFilter.java | 36 ++++++++++++++++++++ 3 files changed, 38 insertions(+), 38 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/5ab660e3/log4j-core/src/test/java/org/apache/logging/log4j/core/net/server/AbstractSocketServerTest.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/net/server/AbstractSocketServerTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/net/server/AbstractSocketServerTest.java index 04603f5..f72a244 100644 --- a/log4j-core/src/test/java/org/apache/logging/log4j/core/net/server/AbstractSocketServerTest.java +++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/net/server/AbstractSocketServerTest.java @@ -161,8 +161,8 @@ public abstract class AbstractSocketServerTest { } protected void testServer(final String... messages) throws Exception { - final Filter socketFilter = new ThreadFilter(Filter.Result.NEUTRAL, Filter.Result.DENY); - final Filter serverFilter = new ThreadFilter(Filter.Result.DENY, Filter.Result.NEUTRAL); + final Filter socketFilter = new ThreadNameFilter(Filter.Result.NEUTRAL, Filter.Result.DENY); + final Filter serverFilter = new ThreadNameFilter(Filter.Result.DENY, Filter.Result.NEUTRAL); final Layout<? extends Serializable> socketLayout = createLayout(); final SocketAppender socketAppender = createSocketAppender(socketFilter, socketLayout); socketAppender.start(); http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/5ab660e3/log4j-core/src/test/java/org/apache/logging/log4j/core/net/server/ThreadFilter.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/net/server/ThreadFilter.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/net/server/ThreadFilter.java deleted file mode 100644 index 1ae05ba..0000000 --- a/log4j-core/src/test/java/org/apache/logging/log4j/core/net/server/ThreadFilter.java +++ /dev/null @@ -1,36 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You 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. - */ - -package org.apache.logging.log4j.core.net.server; - -import org.apache.logging.log4j.core.Filter; -import org.apache.logging.log4j.core.LogEvent; -import org.apache.logging.log4j.core.filter.AbstractFilter; - -public class ThreadFilter extends AbstractFilter { - - private static final long serialVersionUID = 1L; - - public ThreadFilter(final Result onMatch, final Result onMismatch) { - super(onMatch, onMismatch); - } - - @Override - public Filter.Result filter(final LogEvent event) { - return event.getThreadName().equals(Thread.currentThread().getName()) ? onMatch : onMismatch; - } -} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/5ab660e3/log4j-core/src/test/java/org/apache/logging/log4j/core/net/server/ThreadNameFilter.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/net/server/ThreadNameFilter.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/net/server/ThreadNameFilter.java new file mode 100644 index 0000000..b40eaa5 --- /dev/null +++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/net/server/ThreadNameFilter.java @@ -0,0 +1,36 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You 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. + */ + +package org.apache.logging.log4j.core.net.server; + +import org.apache.logging.log4j.core.Filter; +import org.apache.logging.log4j.core.LogEvent; +import org.apache.logging.log4j.core.filter.AbstractFilter; + +public class ThreadNameFilter extends AbstractFilter { + + private static final long serialVersionUID = 1L; + + public ThreadNameFilter(final Result onMatch, final Result onMismatch) { + super(onMatch, onMismatch); + } + + @Override + public Filter.Result filter(final LogEvent event) { + return event.getThreadName().equals(Thread.currentThread().getName()) ? onMatch : onMismatch; + } +} \ No newline at end of file
