Skip to content

android: fix shortening of one-letter names #1

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.

Sign up for GitHub

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

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

android: fix shortening of one-letter names #1

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
74c218e
android: fix shortening of one-letter names
Oct 7, 2019
e07d395
android: fix an indentation problem
Oct 7, 2019
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
45 changes: 24 additions & 21 deletions slf4j-android/src/main/java/org/slf4j/impl/AndroidLoggerFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,26 +60,26 @@ public AndroidLogger getLogger(final String name)
final String tag = forceValidName(name); // fix for bug #173

AndroidLogger logger = loggerMap.get(tag);
if (logger != null) return logger;
if (logger != null) return logger;

logger = new AndroidLogger(tag);
AndroidLogger loggerPutBefore = loggerMap.putIfAbsent(tag, logger);
if (null == loggerPutBefore)
{
if (!tag.equals(name) && Log.isLoggable(AndroidLoggerFactory.class.getSimpleName(), Log.WARN))
{
Log.i(AndroidLoggerFactory.class.getSimpleName(), new StringBuilder("SLF4J Logger name '")
.append(name)
.append("' exceeds maximum length of ")
.append(TAG_MAX_LENGTH)
.append(" characters; using '")
.append(tag)
.append("' as the Android Log tag instead.")
.toString());
}
return logger;
}
return loggerPutBefore;
logger = new AndroidLogger(tag);
AndroidLogger loggerPutBefore = loggerMap.putIfAbsent(tag, logger);
if (null == loggerPutBefore)
{
if (!tag.equals(name) && Log.isLoggable(AndroidLoggerFactory.class.getSimpleName(), Log.WARN))
{
Log.i(AndroidLoggerFactory.class.getSimpleName(), new StringBuilder("SLF4J Logger name '")
.append(name)
.append("' exceeds maximum length of ")
.append(TAG_MAX_LENGTH)
.append(" characters; using '")
.append(tag)
.append("' as the Android Log tag instead.")
.toString());
}
return logger;
}
return loggerPutBefore;
}

/**
Expand All @@ -100,17 +100,20 @@ private final String forceValidName(String name)
if (token.length() == 1) // token of one character appended as is
{
sb.append(token);
sb.append('.');
}
else if (st.hasMoreTokens()) // truncate all but the last token
{
sb.append(token.charAt(0));
sb.append("*.");
sb.append('*');
}
else // last token (usually class name) appended as is
{
sb.append(token);
}
if (st.hasMoreTokens())
{
sb.append('.');
}
} while (st.hasMoreTokens());

name = sb.toString();
Expand Down