Author: markt
Date: Thu May 20 12:07:38 2010
New Revision: 946604
URL: http://svn.apache.org/viewvc?rev=946604&view=rev
Log:
Minor clean-up. Result is always converted to String so just do it once.
Modified:
tomcat/trunk/java/org/apache/catalina/ant/AbstractCatalinaTask.java
tomcat/trunk/java/org/apache/catalina/realm/JNDIRealm.java
tomcat/trunk/java/org/apache/catalina/session/ManagerBase.java
tomcat/trunk/java/org/apache/catalina/util/Base64.java
Modified: tomcat/trunk/java/org/apache/catalina/ant/AbstractCatalinaTask.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ant/AbstractCatalinaTask.java?rev=946604&r1=946603&r2=946604&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ant/AbstractCatalinaTask.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/ant/AbstractCatalinaTask.java Thu May
20 12:07:38 2010
@@ -199,7 +199,7 @@ public abstract class AbstractCatalinaTa
// Set up an authorization header with our credentials
String input = username + ":" + password;
- String output = new String(Base64.encode(input.getBytes()));
+ String output = Base64.encode(input.getBytes());
hconn.setRequestProperty("Authorization",
"Basic " + output);
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=946604&r1=946603&r2=946604&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/realm/JNDIRealm.java (original)
+++ tomcat/trunk/java/org/apache/catalina/realm/JNDIRealm.java Thu May 20
12:07:38 2010
@@ -1474,8 +1474,7 @@ public class JNDIRealm extends RealmBase
password = password.substring(5);
md.reset();
md.update(credentials.getBytes());
- String digestedPassword =
- new String(Base64.encode(md.digest()));
+ String digestedPassword = Base64.encode(md.digest());
validated = password.equals(digestedPassword);
}
} else if (password.startsWith("{SSHA}")) {
Modified: tomcat/trunk/java/org/apache/catalina/session/ManagerBase.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/session/ManagerBase.java?rev=946604&r1=946603&r2=946604&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/session/ManagerBase.java (original)
+++ tomcat/trunk/java/org/apache/catalina/session/ManagerBase.java Thu May 20
12:07:38 2010
@@ -400,7 +400,7 @@ public abstract class ManagerBase extend
ExceptionUtils.handleThrowable(t);
}
if (apr) {
- setEntropy(new String(Base64.encode(result)));
+ setEntropy(Base64.encode(result));
} else {
setEntropy(this.toString());
}
Modified: tomcat/trunk/java/org/apache/catalina/util/Base64.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/util/Base64.java?rev=946604&r1=946603&r2=946604&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/util/Base64.java (original)
+++ tomcat/trunk/java/org/apache/catalina/util/Base64.java Thu May 20 12:07:38
2010
@@ -17,6 +17,8 @@
package org.apache.catalina.util;
+import java.io.UnsupportedEncodingException;
+
import org.apache.tomcat.util.buf.ByteChunk;
import org.apache.tomcat.util.buf.CharChunk;
@@ -112,8 +114,7 @@ public final class Base64
* @param binaryData Array containing binary data to encode.
* @return Base64-encoded data.
*/
- public static byte[] encode( byte[] binaryData )
- {
+ public static String encode(byte[] binaryData) {
int lengthDataBits = binaryData.length*EIGHTBIT;
int fewerThan24bits = lengthDataBits%TWENTYFOURBITGROUP;
int numberTriplets = lengthDataBits/TWENTYFOURBITGROUP;
@@ -198,7 +199,14 @@ public final class Base64
encodedData[encodedIndex + 3] = PAD;
}
- return encodedData;
+ String result;
+ try {
+ result = new String(encodedData, "ISO-8859-1");
+ } catch (UnsupportedEncodingException e) {
+ // Should never happen but in case it does...
+ result = new String(encodedData);
+ }
+ return result;
}
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
