From 31b18a4bb7dba3791b6616fd5b00b9888231cbbe Mon Sep 17 00:00:00 2001 From: Roland Weber Date: Sun, 26 Aug 2007 09:05:19 +0000 Subject: [PATCH] interface FormattedHeader to avoid instanceof check on implementation class git-svn-id: https://svn.apache.org/repos/asf/jakarta/httpcomponents/httpclient/trunk@569782 13f79535-47bb-0310-9956-ffa450edef68 --- .../java/org/apache/http/impl/auth/RFC2617Scheme.java | 8 ++++---- .../http/impl/client/DefaultAuthenticationHandler.java | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/module-client/src/main/java/org/apache/http/impl/auth/RFC2617Scheme.java b/module-client/src/main/java/org/apache/http/impl/auth/RFC2617Scheme.java index e9ef9aa69..227202e92 100644 --- a/module-client/src/main/java/org/apache/http/impl/auth/RFC2617Scheme.java +++ b/module-client/src/main/java/org/apache/http/impl/auth/RFC2617Scheme.java @@ -35,11 +35,11 @@ import java.util.Map; import org.apache.http.Header; import org.apache.http.HeaderElement; +import org.apache.http.FormattedHeader; import org.apache.http.auth.AuthScheme; import org.apache.http.auth.AUTH; import org.apache.http.auth.MalformedChallengeException; import org.apache.http.message.BasicHeaderValueParser; -import org.apache.http.message.BufferedHeader; import org.apache.http.protocol.HTTP; import org.apache.http.util.CharArrayBuffer; @@ -96,9 +96,9 @@ public abstract class RFC2617Scheme implements AuthScheme { CharArrayBuffer buffer; int pos; - if (header instanceof BufferedHeader) { - buffer = ((BufferedHeader) header).getBuffer(); - pos = ((BufferedHeader) header).getValuePos(); + if (header instanceof FormattedHeader) { + buffer = ((FormattedHeader) header).getBuffer(); + pos = ((FormattedHeader) header).getValuePos(); } else { String s = header.getValue(); if (s == null) { diff --git a/module-client/src/main/java/org/apache/http/impl/client/DefaultAuthenticationHandler.java b/module-client/src/main/java/org/apache/http/impl/client/DefaultAuthenticationHandler.java index b171611c8..b908d24f9 100644 --- a/module-client/src/main/java/org/apache/http/impl/client/DefaultAuthenticationHandler.java +++ b/module-client/src/main/java/org/apache/http/impl/client/DefaultAuthenticationHandler.java @@ -41,6 +41,7 @@ import java.util.Map; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.http.Header; +import org.apache.http.FormattedHeader; import org.apache.http.HttpResponse; import org.apache.http.HttpStatus; import org.apache.http.auth.AUTH; @@ -51,7 +52,6 @@ import org.apache.http.auth.MalformedChallengeException; import org.apache.http.client.AuthenticationHandler; import org.apache.http.client.params.HttpClientParams; import org.apache.http.client.protocol.ClientContext; -import org.apache.http.message.BufferedHeader; import org.apache.http.params.HttpParams; import org.apache.http.protocol.HTTP; import org.apache.http.protocol.HttpContext; @@ -101,9 +101,9 @@ public class DefaultAuthenticationHandler implements AuthenticationHandler { Header header = headers[i]; CharArrayBuffer buffer; int pos; - if (header instanceof BufferedHeader) { - buffer = ((BufferedHeader) header).getBuffer(); - pos = ((BufferedHeader) header).getValuePos(); + if (header instanceof FormattedHeader) { + buffer = ((FormattedHeader) header).getBuffer(); + pos = ((FormattedHeader) header).getValuePos(); } else { String s = header.getValue(); if (s == null) {