From commits-return-7491-apmail-jmeter-commits-archive=jmeter.apache.org@jmeter.apache.org  Thu Apr 20 18:27:32 2017
Return-Path: <commits-return-7491-apmail-jmeter-commits-archive=jmeter.apache.org@jmeter.apache.org>
X-Original-To: apmail-jmeter-commits-archive@minotaur.apache.org
Delivered-To: apmail-jmeter-commits-archive@minotaur.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id 1D81319693
	for <apmail-jmeter-commits-archive@minotaur.apache.org>; Thu, 20 Apr 2017 18:27:32 +0000 (UTC)
Received: (qmail 48139 invoked by uid 500); 20 Apr 2017 18:27:32 -0000
Delivered-To: apmail-jmeter-commits-archive@jmeter.apache.org
Received: (qmail 48100 invoked by uid 500); 20 Apr 2017 18:27:31 -0000
Mailing-List: contact commits-help@jmeter.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@jmeter.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@jmeter.apache.org>
List-Post: <mailto:commits@jmeter.apache.org>
List-Id: <commits.jmeter.apache.org>
Reply-To: dev@jmeter.apache.org
Delivered-To: mailing list commits@jmeter.apache.org
Received: (qmail 48091 invoked by uid 99); 20 Apr 2017 18:27:31 -0000
Received: from Unknown (HELO svn01-us-west.apache.org) (209.188.14.144)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 20 Apr 2017 18:27:31 +0000
Received: from svn01-us-west.apache.org (localhost [127.0.0.1])
	by svn01-us-west.apache.org (ASF Mail Server at svn01-us-west.apache.org) with ESMTP id EB8E13A04F3
	for <commits@jmeter.apache.org>; Thu, 20 Apr 2017 18:27:30 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1792106 - in /jmeter/trunk:
 src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSamplerBase.java
 xdocs/changes.xml
Date: Thu, 20 Apr 2017 18:27:30 -0000
To: commits@jmeter.apache.org
From: pmouawad@apache.org
X-Mailer: svnmailer-1.0.9
Message-Id: <20170420182730.EB8E13A04F3@svn01-us-west.apache.org>

Author: pmouawad
Date: Thu Apr 20 18:27:30 2017
New Revision: 1792106

URL: http://svn.apache.org/viewvc?rev=1792106&view=rev
Log:
Bug 61011 - Replace occurrences count is not correct (Path and Host replacement are counted twice)
Bugzilla Id: 61011

Modified:
    jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSamplerBase.java
    jmeter/trunk/xdocs/changes.xml

Modified: jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSamplerBase.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSamplerBase.java?rev=1792106&r1=1792105&r2=1792106&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSamplerBase.java (original)
+++ jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSamplerBase.java Thu Apr 20 18:27:30 2017
@@ -2073,7 +2073,6 @@ public abstract class HTTPSamplerBase ex
             // check if there is anything to replace
             int nbReplaced = ((Integer)result[1]).intValue();
             if (nbReplaced>0) {
-                totalReplaced += nbReplaced;
                 String replacedText = (String) result[0];
                 setPath(replacedText);
                 totalReplaced += nbReplaced;
@@ -2085,7 +2084,6 @@ public abstract class HTTPSamplerBase ex
             // check if there is anything to replace
             int nbReplaced = ((Integer)result[1]).intValue();
             if (nbReplaced>0) {
-                totalReplaced += nbReplaced;
                 String replacedText = (String) result[0];
                 setDomain(replacedText);
                 totalReplaced += nbReplaced;

Modified: jmeter/trunk/xdocs/changes.xml
URL: http://svn.apache.org/viewvc/jmeter/trunk/xdocs/changes.xml?rev=1792106&r1=1792105&r2=1792106&view=diff
==============================================================================
--- jmeter/trunk/xdocs/changes.xml [utf-8] (original)
+++ jmeter/trunk/xdocs/changes.xml [utf-8] Thu Apr 20 18:27:30 2017
@@ -164,6 +164,7 @@ Summary
 <h3>General</h3>
 <ul>
     <li><bug>60994</bug>Fix some typo in comments or log messages. <pr>289</pr> and <pr>290</pr></li>
+    <li><bug>61011</bug>Replace occurrences count is not correct (Path and Host replacement are counted twice)</li>
 </ul>
 
  <!--  =================== Thanks =================== -->