You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jmeter.apache.org by pm...@apache.org on 2016/12/31 16:08:25 UTC
svn commit: r1776794 - in /jmeter/trunk:
src/protocol/http/org/apache/jmeter/protocol/http/control/Authorization.java
xdocs/changes.xml
Author: pmouawad
Date: Sat Dec 31 16:08:25 2016
New Revision: 1776794
URL: http://svn.apache.org/viewvc?rev=1776794&view=rev
Log:
Use java.util.Base64
Mention deprecation of Base64Encode in changes.xml
Modified:
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/Authorization.java
jmeter/trunk/xdocs/changes.xml
Modified: jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/Authorization.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/Authorization.java?rev=1776794&r1=1776793&r2=1776794&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/Authorization.java (original)
+++ jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/Authorization.java Sat Dec 31 16:08:25 2016
@@ -19,10 +19,11 @@
package org.apache.jmeter.protocol.http.control;
import java.io.Serializable;
+import java.nio.charset.Charset;
+import java.util.Base64;
import org.apache.jmeter.config.ConfigElement;
import org.apache.jmeter.protocol.http.control.AuthManager.Mechanism;
-import org.apache.jmeter.protocol.http.util.Base64Encoder;
import org.apache.jmeter.testelement.AbstractTestElement;
/**
@@ -131,6 +132,7 @@ public class Authorization extends Abstr
}
public String toBasicHeader(){
- return "Basic " + Base64Encoder.encode(getUser() + ":" + getPass());
+ return new String(Base64.getEncoder().encode((getUser() + ":" + getPass()).
+ getBytes(Charset.defaultCharset())), Charset.defaultCharset());
}
}
Modified: jmeter/trunk/xdocs/changes.xml
URL: http://svn.apache.org/viewvc/jmeter/trunk/xdocs/changes.xml?rev=1776794&r1=1776793&r2=1776794&view=diff
==============================================================================
--- jmeter/trunk/xdocs/changes.xml [utf-8] (original)
+++ jmeter/trunk/xdocs/changes.xml [utf-8] Sat Dec 31 16:08:25 2016
@@ -98,6 +98,7 @@ Fill in some detail.
<li>Drop deprecated class <code>org.apache.jmeter.reporters.FileReporter</code></li>
<li>Drop deprecated class <code>org.apache.jmeter.protocol.http.modifier.UserSequence</code></li>
<li>Drop deprecated class <code>org.apache.jmeter.protocol.http.parser.HTMLParseError</code></li>
+ <li><code>org.apache.jmeter.protocol.http.util.Base64Encode</code> has been deprecated, you can use <code>java.util.Base64</code> as a replacement</li>
</ul>
<!-- =================== Improvements =================== -->