You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by rp...@apache.org on 2016/08/22 12:19:02 UTC
[2/3] logging-log4j2 git commit: Refactor string into constant.
Refactor string into constant.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/c67ed221
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/c67ed221
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/c67ed221
Branch: refs/heads/LOG4J2-1010&LOG4J2-1447-injectable-contextdata&better-datastructure
Commit: c67ed221adc3199addffea0c537ae2ee97580720
Parents: 67b4ba5
Author: ggregory <gg...@US-L-GG02.rocketsoftware.com>
Authored: Sun Aug 21 22:12:16 2016 -0700
Committer: ggregory <gg...@US-L-GG02.rocketsoftware.com>
Committed: Sun Aug 21 22:12:16 2016 -0700
----------------------------------------------------------------------
.../logging/log4j/core/config/ConfigurationFactory.java | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/c67ed221/log4j-core/src/main/java/org/apache/logging/log4j/core/config/ConfigurationFactory.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/ConfigurationFactory.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/ConfigurationFactory.java
index c1a3684..7452dfa 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/ConfigurationFactory.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/ConfigurationFactory.java
@@ -381,6 +381,8 @@ public abstract class ConfigurationFactory extends ConfigurationBuilderFactory {
*/
private static class Factory extends ConfigurationFactory {
+ private static final String ALL_TYPES = "*";
+
/**
* Default Factory Constructor.
* @param name The configuration name.
@@ -414,7 +416,7 @@ public abstract class ConfigurationFactory extends ConfigurationBuilderFactory {
final String[] types = factory.getSupportedTypes();
if (types != null) {
for (final String type : types) {
- if (type.equals("*")) {
+ if (type.equals(ALL_TYPES)) {
final Configuration config = factory.getConfiguration(name, configLocation);
if (config != null) {
return config;
@@ -430,7 +432,7 @@ public abstract class ConfigurationFactory extends ConfigurationBuilderFactory {
final String[] types = factory.getSupportedTypes();
if (types != null) {
for (final String type : types) {
- if (type.equals("*") || configLocationStr.endsWith(type)) {
+ if (type.equals(ALL_TYPES) || configLocationStr.endsWith(type)) {
final Configuration config = factory.getConfiguration(name, configLocation);
if (config != null) {
return config;
@@ -475,7 +477,7 @@ public abstract class ConfigurationFactory extends ConfigurationBuilderFactory {
final String[] types = factory.getSupportedTypes();
if (types != null) {
for (final String type : types) {
- if (type.equals("*") || configLocationStr.endsWith(type)) {
+ if (type.equals(ALL_TYPES) || configLocationStr.endsWith(type)) {
final Configuration config = factory.getConfiguration(source);
if (config != null) {
return config;
@@ -500,7 +502,7 @@ public abstract class ConfigurationFactory extends ConfigurationBuilderFactory {
}
for (final String suffix : types) {
- if (suffix.equals("*")) {
+ if (suffix.equals(ALL_TYPES)) {
continue;
}
configName = named ? prefix + name + suffix : prefix + suffix;
@@ -527,7 +529,7 @@ public abstract class ConfigurationFactory extends ConfigurationBuilderFactory {
final String[] types = factory.getSupportedTypes();
if (types != null) {
for (final String type : types) {
- if (type.equals("*") || config != null && config.endsWith(type)) {
+ if (type.equals(ALL_TYPES) || config != null && config.endsWith(type)) {
final Configuration c = factory.getConfiguration(source);
if (c != null) {
LOGGER.debug("Loaded configuration from {}", source);