You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2011/06/06 18:53:58 UTC
svn commit: r1132702 - in /tomcat/trunk/java/org/apache/catalina:
realm/RealmBase.java util/HexUtils.java
Author: markt
Date: Mon Jun 6 16:53:58 2011
New Revision: 1132702
URL: http://svn.apache.org/viewvc?rev=1132702&view=rev
Log:
Only need 1 HexUtils class
Removed:
tomcat/trunk/java/org/apache/catalina/util/HexUtils.java
Modified:
tomcat/trunk/java/org/apache/catalina/realm/RealmBase.java
Modified: tomcat/trunk/java/org/apache/catalina/realm/RealmBase.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/realm/RealmBase.java?rev=1132702&r1=1132701&r2=1132702&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/realm/RealmBase.java (original)
+++ tomcat/trunk/java/org/apache/catalina/realm/RealmBase.java Mon Jun 6 16:53:58 2011
@@ -48,11 +48,11 @@ import org.apache.catalina.deploy.LoginC
import org.apache.catalina.deploy.SecurityCollection;
import org.apache.catalina.deploy.SecurityConstraint;
import org.apache.catalina.mbeans.MBeanUtils;
-import org.apache.catalina.util.HexUtils;
import org.apache.catalina.util.LifecycleMBeanBase;
import org.apache.catalina.util.MD5Encoder;
import org.apache.juli.logging.Log;
import org.apache.juli.logging.LogFactory;
+import org.apache.tomcat.util.buf.HexUtils;
import org.apache.tomcat.util.res.StringManager;
import org.ietf.jgss.GSSContext;
import org.ietf.jgss.GSSCredential;
@@ -1142,7 +1142,7 @@ public abstract class RealmBase extends
}
md.update(bytes);
- return (HexUtils.convert(md.digest()));
+ return (HexUtils.toHexString(md.digest()));
} catch (Exception e) {
log.error(sm.getString("realmBase.digest"), e);
return (credentials);
@@ -1290,7 +1290,7 @@ public abstract class RealmBase extends
}
// Digest the credentials and return as hexadecimal
- return (HexUtils.convert(md.digest()));
+ return (HexUtils.toHexString(md.digest()));
} catch(Exception ex) {
log.error(ex);
return credentials;
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org