From 74ed4ead0593b62b2b28bfe2caf26de2edfa114d Mon Sep 17 00:00:00 2001
From: kkolinko <kkolinko@13f79535-47bb-0310-9956-ffa450edef68>
Date: Sun, 3 Apr 2011 22:38:23 +0000
Subject: [PATCH] Followup to r1087416: Correct typos in messages and remove
 one e.printStackTrace() call.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1088430 13f79535-47bb-0310-9956-ffa450edef68
---
 java/org/apache/catalina/realm/LocalStrings.properties | 2 +-
 java/org/apache/catalina/realm/RealmBase.java          | 3 +--
 webapps/docs/config/valve.xml                          | 2 +-
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/java/org/apache/catalina/realm/LocalStrings.properties b/java/org/apache/catalina/realm/LocalStrings.properties
index c2485019d..71af6b2c7 100644
--- a/java/org/apache/catalina/realm/LocalStrings.properties
+++ b/java/org/apache/catalina/realm/LocalStrings.properties
@@ -65,7 +65,7 @@ memoryRealm.readXml=Exception while reading memory database file
 memoryRealm.xmlFeatureEncoding=Exception configuring digester to permit java encoding names in XML files. Only IANA encoding names will be supported.
 realmBase.algorithm=Invalid message digest algorithm {0} specified
 realmBase.alreadyStarted=This Realm has already been started
-realmBase.delegatedCredentialFail=Unable to obtain delegated credentials for user [{0}
+realmBase.delegatedCredentialFail=Unable to obtain delegated credentials for user [{0}]
 realmBase.digest=Error digesting user credentials
 realmBase.forbidden=Access to the requested resource has been denied
 realmBase.hasRoleFailure=Username {0} does NOT have role {1}
diff --git a/java/org/apache/catalina/realm/RealmBase.java b/java/org/apache/catalina/realm/RealmBase.java
index f14847f5d..7b5653257 100644
--- a/java/org/apache/catalina/realm/RealmBase.java
+++ b/java/org/apache/catalina/realm/RealmBase.java
@@ -471,7 +471,6 @@ public abstract class RealmBase extends LifecycleMBeanBase implements Realm {
                     try {
                         gssCredential = gssContext.getDelegCred();
                     } catch (GSSException e) {
-                        e.printStackTrace();
                         if (log.isDebugEnabled()) {
                             log.debug(sm.getString(
                                     "realmBase.delegatedCredentialFail", name),
@@ -830,7 +829,7 @@ public abstract class RealmBase extends LifecycleMBeanBase implements Realm {
             if (roles.length == 0 && !constraint.getAllRoles()) {
                 if(constraint.getAuthConstraint()) {
                     if( log.isDebugEnabled() )
-                        log.debug("No role)s ");
+                        log.debug("No roles");
                     status = false; // No listed roles means no access at all
                     denyfromall = true;
                     break;
diff --git a/webapps/docs/config/valve.xml b/webapps/docs/config/valve.xml
index 23b5bff8e..2939d991d 100644
--- a/webapps/docs/config/valve.xml
+++ b/webapps/docs/config/valve.xml
@@ -930,7 +930,7 @@
         the user Principal. If available, the delegated credential will be
         available to applications (e.g. for onward authentication to external
         services) via the <code>org.apache.catalina.realm.GSS_CREDENTIAL</code>
-        request attribute.If not set, the default value of <code>true</code>
+        request attribute. If not set, the default value of <code>true</code>
         will be used.</p>
       </attribute>
 
-- 
2.11.0