jmeter-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sebb <seb...@gmail.com>
Subject Re: svn commit: r1790041 - /jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/HeaderManager.java
Date Thu, 06 Apr 2017 13:20:18 GMT
On 3 April 2017 at 20:22,  <pmouawad@apache.org> wrote:
> Author: pmouawad
> Date: Mon Apr  3 19:22:21 2017
> New Revision: 1790041
>
> URL: http://svn.apache.org/viewvc?rev=1790041&view=rev
> Log:
> Reintroduce old method in deprecated mode
>
> Modified:
>     jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/HeaderManager.java
>
> Modified: jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/HeaderManager.java
> URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/HeaderManager.java?rev=1790041&r1=1790040&r2=1790041&view=diff
> ==============================================================================
> --- jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/HeaderManager.java
(original)
> +++ jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/HeaderManager.java
Mon Apr  3 19:22:21 2017
> @@ -226,6 +226,24 @@ public class HeaderManager extends Confi
>       *
>       * @param element
>       *            The object to be merged with
> +     * @param preferLocalValues Not used
> +     * @return merged HeaderManager
> +     * @throws IllegalArgumentException
> +     *             if <code>element</code> is not an instance of
> +     *             {@link HeaderManager}
> +     *
> +     * @deprecated use {@link HeaderManager#merge(TestElement)} as this method will
be removed in a future version

It can be useful to add the version in which it was deprecated,e.g.

* @deprecated (m.n) use {@link HeaderManager#merge(TestElement)} as
this method will be removed in a future version

> +     */
> +    @Deprecated
> +    public HeaderManager merge(TestElement element, boolean preferLocalValues) {
> +        return merge(element);
> +    }
> +
> +    /**
> +     * Merge the attributes with a another HeaderManager's attributes.
> +     *
> +     * @param element
> +     *            The object to be merged with
>       * @return merged HeaderManager
>       * @throws IllegalArgumentException
>       *             if <code>element</code> is not an instance of
>
>

Mime
View raw message