Apache
/
httpcomponents-client
mirror of https://github.com/apache/httpcomponents-client.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Unnecessary null check. 

Move setup of default value to where variable is declared

git-svn-id: https://svn.apache.org/repos/asf/httpcomponents/httpclient/trunk@1406892 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Sebastian Bazley 2012-11-08 01:52:14 +00:00
parent df203b7dcd
commit 7201c0c216
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
httpclient/src/main/java/org/apache/http/impl/auth/DigestScheme.java
View File

@ -257,6 +257,10 @@ public class DigestScheme extends RFC2617Scheme {
String opaque = getParameter("opaque");
String method = getParameter("methodname");
String algorithm = getParameter("algorithm");
// If an algorithm is not specified, default to MD5.
if (algorithm == null) {
algorithm = "MD5";
}
Set<String> qopset = new HashSet<String>(8);
int qop = QOP_UNKNOWN;
@ -280,10 +284,6 @@ public class DigestScheme extends RFC2617Scheme {
throw new AuthenticationException("None of the qop methods is supported: " + qoplist);
}
// If an algorithm is not specified, default to MD5.
if (algorithm == null) {
algorithm = "MD5";
}
String charset = getParameter("charset");
if (charset == null) {
charset = "ISO-8859-1";
@ -418,9 +418,8 @@ public class DigestScheme extends RFC2617Scheme {
params.add(new BasicNameValuePair("nc", nc));
params.add(new BasicNameValuePair("cnonce", cnonce));
}
if (algorithm != null) {
params.add(new BasicNameValuePair("algorithm", algorithm));
}
// algorithm cannot be null here
params.add(new BasicNameValuePair("algorithm", algorithm));
if (opaque != null) {
params.add(new BasicNameValuePair("opaque", opaque));
}