Author: violetagg
Date: Fri Aug 19 07:45:06 2016
New Revision: 1756878
URL: http://svn.apache.org/viewvc?rev=1756878&view=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=60012
Improvements in the log messages. Based on suggestions by Nemo Chen.
Modified:
tomcat/trunk/java/org/apache/catalina/authenticator/AuthenticatorBase.java
tomcat/trunk/java/org/apache/catalina/realm/JNDIRealm.java
tomcat/trunk/java/org/apache/catalina/startup/CatalinaProperties.java
tomcat/trunk/java/org/apache/catalina/storeconfig/StoreLoader.java
tomcat/trunk/webapps/docs/changelog.xml
Modified:
tomcat/trunk/java/org/apache/catalina/authenticator/AuthenticatorBase.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/authenticator/AuthenticatorBase.java?rev=1756878&r1=1756877&r2=1756878&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/authenticator/AuthenticatorBase.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/authenticator/AuthenticatorBase.java
Fri Aug 19 07:45:06 2016
@@ -438,7 +438,7 @@ public abstract class AuthenticatorBase
if (principal != null) {
if (log.isDebugEnabled()) {
log.debug("We have cached auth type " +
session.getAuthType() +
- " for principal " +
session.getPrincipal());
+ " for principal " + principal);
}
request.setAuthType(session.getAuthType());
request.setUserPrincipal(principal);
Modified: tomcat/trunk/java/org/apache/catalina/realm/JNDIRealm.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/realm/JNDIRealm.java?rev=1756878&r1=1756877&r2=1756878&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/realm/JNDIRealm.java (original)
+++ tomcat/trunk/java/org/apache/catalina/realm/JNDIRealm.java Fri Aug 19
07:45:06 2016
@@ -29,7 +29,6 @@ import java.util.Arrays;
import java.util.Collections;
import java.util.HashMap;
import java.util.Hashtable;
-import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
@@ -1115,7 +1114,7 @@ public class JNDIRealm extends RealmBase
} else {
this.cipherSuitesArray = cipherSuites.trim().split("\\s*,\\s*");
containerLog.debug(sm.getString("jndiRealm.cipherSuites",
- Arrays.asList(this.cipherSuitesArray)));
+ Arrays.toString(this.cipherSuitesArray)));
}
return this.cipherSuitesArray;
}
@@ -1354,15 +1353,9 @@ public class JNDIRealm extends RealmBase
// Search for additional roles
List<String> roles = getRoles(context, user);
if (containerLog.isDebugEnabled()) {
- Iterator<String> it = roles.iterator();
- // TODO: Use a single log message
- while (it.hasNext()) {
- containerLog.debug("Found role: " +
it.next());
- }
+ containerLog.debug("Found roles: " +
roles.toString());
}
- return (new GenericPrincipal(username,
- credentials,
- roles));
+ return (new GenericPrincipal(username,
credentials, roles));
}
} catch (InvalidNameException ine) {
// Log the problem for posterity
@@ -1388,11 +1381,7 @@ public class JNDIRealm extends RealmBase
// Search for additional roles
List<String> roles = getRoles(context, user);
if (containerLog.isDebugEnabled()) {
- Iterator<String> it = roles.iterator();
- // TODO: Use a single log message
- while (it.hasNext()) {
- containerLog.debug("Found role: " + it.next());
- }
+ containerLog.debug("Found roles: " + roles.toString());
}
// Create and return a suitable Principal for this user
@@ -1915,8 +1904,7 @@ public class JNDIRealm extends RealmBase
if (containerLog.isTraceEnabled()) {
containerLog.trace(" Found " + list.size() + " user internal
roles");
- for (int i=0; i<list.size(); i++)
- containerLog.trace( " Found user internal role " +
list.get(i));
+ containerLog.trace(" Found user internal roles " +
list.toString());
}
// Are we configured to do role searches?
@@ -2703,44 +2691,42 @@ public class JNDIRealm extends RealmBase
// Get the entry's distinguished name. For relative results, this
means
// we need to composite a name with the base name, the context name,
and
// the result name. For non-relative names, use the returned name.
+ String resultName = result.getName();
if (result.isRelative()) {
if (containerLog.isTraceEnabled()) {
- containerLog.trace(" search returned relative name: " +
- result.getName());
+ containerLog.trace(" search returned relative name: " +
resultName);
}
NameParser parser = context.getNameParser("");
Name contextName = parser.parse(context.getNameInNamespace());
Name baseName = parser.parse(base);
// Bugzilla 32269
- Name entryName =
- parser.parse(new CompositeName(result.getName()).get(0));
+ Name entryName = parser.parse(new CompositeName(resultName).get(0));
Name name = contextName.addAll(baseName);
name = name.addAll(entryName);
return name.toString();
} else {
- String absoluteName = result.getName();
- if (containerLog.isTraceEnabled())
- containerLog.trace(" search returned absolute name: " +
- result.getName());
+ if (containerLog.isTraceEnabled()) {
+ containerLog.trace(" search returned absolute name: " +
resultName);
+ }
try {
// Normalize the name by running it through the name parser.
NameParser parser = context.getNameParser("");
- URI userNameUri = new URI(absoluteName);
+ URI userNameUri = new URI(resultName);
String pathComponent = userNameUri.getPath();
// Should not ever have an empty path component, since that is
/{DN}
if (pathComponent.length() < 1 ) {
throw new InvalidNameException(
"Search returned unparseable absolute name: " +
- absoluteName );
+ resultName );
}
Name name = parser.parse(pathComponent.substring(1));
return name.toString();
} catch ( URISyntaxException e ) {
throw new InvalidNameException(
"Search returned unparseable absolute name: " +
- absoluteName );
+ resultName );
}
}
}
Modified: tomcat/trunk/java/org/apache/catalina/startup/CatalinaProperties.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/CatalinaProperties.java?rev=1756878&r1=1756877&r2=1756878&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/CatalinaProperties.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/startup/CatalinaProperties.java Fri
Aug 19 07:45:06 2016
@@ -60,8 +60,6 @@ public class CatalinaProperties {
private static void loadProperties() {
InputStream is = null;
- Throwable error = null;
-
try {
String configUrl = System.getProperty("catalina.config");
if (configUrl != null) {
@@ -97,7 +95,7 @@ public class CatalinaProperties {
properties.load(is);
} catch (Throwable t) {
handleThrowable(t);
- error = t;
+ log.warn(t);
} finally {
try {
is.close();
@@ -107,9 +105,9 @@ public class CatalinaProperties {
}
}
- if ((is == null) || (error != null)) {
+ if ((is == null)) {
// Do something
- log.warn("Failed to load catalina.properties", error);
+ log.warn("Failed to load catalina.properties");
// That's fine - we have reasonable defaults.
properties = new Properties();
}
Modified: tomcat/trunk/java/org/apache/catalina/storeconfig/StoreLoader.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/storeconfig/StoreLoader.java?rev=1756878&r1=1756877&r2=1756878&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/storeconfig/StoreLoader.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/storeconfig/StoreLoader.java Fri Aug
19 07:45:06 2016
@@ -194,7 +194,6 @@ public class StoreLoader {
public void load() {
InputStream is = null;
- Throwable error = null;
registryResource = null ;
try {
String configUrl = getConfigUrl();
@@ -241,7 +240,7 @@ public class StoreLoader {
registry = (StoreRegistry) digester.parse(is);
}
} catch (Throwable t) {
- error = t;
+ log.error(t);
} finally {
try {
is.close();
@@ -249,8 +248,8 @@ public class StoreLoader {
}
}
}
- if ((is == null) || (error != null)) {
- log.error(error);
+ if (is == null) {
+ log.error("Failed to load server-registry.xml");
}
}
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1756878&r1=1756877&r2=1756878&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Fri Aug 19 07:45:06 2016
@@ -137,6 +137,10 @@
Switch the CGI servlet to the standard logging mechanism and remove
support for the debug attribute. (markt)
</fix>
+ <fix>
+ <bug>60012</bug>: Improvements in the log messages. Based on
+ suggestions by Nemo Chen. (violetagg)
+ </fix>
</changelog>
</subsection>
<subsection name="Coyote">
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
