Author: sebb
Date: Mon Oct 24 13:11:39 2011
New Revision: 1188141
URL: http://svn.apache.org/viewvc?rev=1188141&view=rev
Log:
Bug 52075 - JMeterProperty.clone() currently returns Object; it should return
JMeterProperty
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/AbstractTestElement.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/property/AbstractProperty.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/property/BooleanProperty.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/property/CollectionProperty.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/property/DoubleProperty.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/property/FloatProperty.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/property/FunctionProperty.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/property/IntegerProperty.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/property/JMeterProperty.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/property/LongProperty.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/property/MapProperty.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/property/NullProperty.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/property/ObjectProperty.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/property/StringProperty.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/property/TestElementProperty.java
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/CookieManager.java
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/util/HTTPFileArg.java
jakarta/jmeter/trunk/xdocs/changes.xml
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/AbstractTestElement.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/AbstractTestElement.java?rev=1188141&r1=1188140&r2=1188141&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/AbstractTestElement.java
(original)
+++
jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/AbstractTestElement.java
Mon Oct 24 13:11:39 2011
@@ -70,7 +70,7 @@ public abstract class AbstractTestElemen
PropertyIterator iter = propertyIterator();
while (iter.hasNext()) {
- clonedElement.setProperty((JMeterProperty)
iter.next().clone());
+ clonedElement.setProperty(iter.next().clone());
}
clonedElement.setRunningVersion(runningVersion);
return clonedElement;
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/property/AbstractProperty.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/property/AbstractProperty.java?rev=1188141&r1=1188140&r2=1188141&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/property/AbstractProperty.java
(original)
+++
jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/property/AbstractProperty.java
Mon Oct 24 13:11:39 2011
@@ -86,7 +86,7 @@ public abstract class AbstractProperty i
/** {@inheritDoc} */
@Override
- public Object clone() {
+ public AbstractProperty clone() {
try {
AbstractProperty prop = (AbstractProperty) super.clone();
prop.name = name;
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/property/BooleanProperty.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/property/BooleanProperty.java?rev=1188141&r1=1188140&r2=1188141&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/property/BooleanProperty.java
(original)
+++
jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/property/BooleanProperty.java
Mon Oct 24 13:11:39 2011
@@ -62,7 +62,7 @@ public class BooleanProperty extends Abs
}
@Override
- public Object clone() {
+ public BooleanProperty clone() {
BooleanProperty prop = (BooleanProperty) super.clone();
prop.value = value;
return prop;
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/property/CollectionProperty.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/property/CollectionProperty.java?rev=1188141&r1=1188140&r2=1188141&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/property/CollectionProperty.java
(original)
+++
jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/property/CollectionProperty.java
Mon Oct 24 13:11:39 2011
@@ -131,7 +131,7 @@ public class CollectionProperty extends
* {@inheritDoc}
*/
@Override
- public Object clone() {
+ public CollectionProperty clone() {
CollectionProperty prop = (CollectionProperty) super.clone();
prop.value = cloneCollection();
return prop;
@@ -143,7 +143,7 @@ public class CollectionProperty extends
Collection<JMeterProperty> newCol = value.getClass().newInstance();
PropertyIterator iter = iterator();
while (iter.hasNext()) {
- newCol.add((JMeterProperty) iter.next().clone());
+ newCol.add(iter.next().clone());
}
return newCol;
} catch (Exception e) {
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/property/DoubleProperty.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/property/DoubleProperty.java?rev=1188141&r1=1188140&r2=1188141&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/property/DoubleProperty.java
(original)
+++
jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/property/DoubleProperty.java
Mon Oct 24 13:11:39 2011
@@ -76,7 +76,7 @@ public class DoubleProperty extends Numb
* {@inheritDoc}
*/
@Override
- public Object clone() {
+ public DoubleProperty clone() {
DoubleProperty prop = (DoubleProperty) super.clone();
prop.value = value;
return prop;
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/property/FloatProperty.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/property/FloatProperty.java?rev=1188141&r1=1188140&r2=1188141&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/property/FloatProperty.java
(original)
+++
jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/property/FloatProperty.java
Mon Oct 24 13:11:39 2011
@@ -92,7 +92,7 @@ public class FloatProperty extends Numbe
* {@inheritDoc}
*/
@Override
- public Object clone() {
+ public FloatProperty clone() {
FloatProperty prop = (FloatProperty) super.clone();
prop.value = value;
return prop;
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/property/FunctionProperty.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/property/FunctionProperty.java?rev=1188141&r1=1188140&r2=1188141&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/property/FunctionProperty.java
(original)
+++
jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/property/FunctionProperty.java
Mon Oct 24 13:11:39 2011
@@ -110,7 +110,7 @@ public class FunctionProperty extends Ab
}
@Override
- public Object clone() {
+ public FunctionProperty clone() {
FunctionProperty prop = (FunctionProperty) super.clone();
prop.cacheValue = cacheValue;
prop.testIteration = testIteration;
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/property/IntegerProperty.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/property/IntegerProperty.java?rev=1188141&r1=1188140&r2=1188141&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/property/IntegerProperty.java
(original)
+++
jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/property/IntegerProperty.java
Mon Oct 24 13:11:39 2011
@@ -97,7 +97,7 @@ public class IntegerProperty extends Num
* {@inheritDoc}
*/
@Override
- public Object clone() {
+ public IntegerProperty clone() {
IntegerProperty prop = (IntegerProperty) super.clone();
prop.value = value;
return prop;
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/property/JMeterProperty.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/property/JMeterProperty.java?rev=1188141&r1=1188140&r2=1188141&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/property/JMeterProperty.java
(original)
+++
jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/property/JMeterProperty.java
Mon Oct 24 13:11:39 2011
@@ -90,5 +90,5 @@ public interface JMeterProperty extends
public void setObjectValue(Object value);
- public Object clone();
+ public JMeterProperty clone();
}
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/property/LongProperty.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/property/LongProperty.java?rev=1188141&r1=1188140&r2=1188141&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/property/LongProperty.java
(original)
+++
jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/property/LongProperty.java
Mon Oct 24 13:11:39 2011
@@ -93,7 +93,7 @@ public class LongProperty extends Number
* {@inheritDoc}
*/
@Override
- public Object clone() {
+ public LongProperty clone() {
LongProperty prop = (LongProperty) super.clone();
prop.value = value;
return prop;
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/property/MapProperty.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/property/MapProperty.java?rev=1188141&r1=1188140&r2=1188141&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/property/MapProperty.java
(original)
+++
jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/property/MapProperty.java
Mon Oct 24 13:11:39 2011
@@ -104,7 +104,7 @@ public class MapProperty extends MultiPr
/** {@inheritDoc} */
@Override
- public Object clone() {
+ public MapProperty clone() {
MapProperty prop = (MapProperty) super.clone();
prop.value = cloneMap();
return prop;
@@ -117,7 +117,7 @@ public class MapProperty extends MultiPr
PropertyIterator iter = valueIterator();
while (iter.hasNext()) {
JMeterProperty item = iter.next();
- newCol.put(item.getName(), (JMeterProperty) item.clone());
+ newCol.put(item.getName(), item.clone());
}
return newCol;
} catch (Exception e) {
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/property/NullProperty.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/property/NullProperty.java?rev=1188141&r1=1188140&r2=1188141&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/property/NullProperty.java
(original)
+++
jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/property/NullProperty.java
Mon Oct 24 13:11:39 2011
@@ -81,7 +81,7 @@ public final class NullProperty extends
}
@Override
- public final Object clone() {
+ public final NullProperty clone() {
return this;
}
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/property/ObjectProperty.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/property/ObjectProperty.java?rev=1188141&r1=1188140&r2=1188141&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/property/ObjectProperty.java
(original)
+++
jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/property/ObjectProperty.java
Mon Oct 24 13:11:39 2011
@@ -56,7 +56,7 @@ public class ObjectProperty extends Abst
* {@inheritDoc}
*/
@Override
- public Object clone() {
+ public ObjectProperty clone() {
ObjectProperty p = (ObjectProperty) super.clone();
p.value = value;
return p;
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/property/StringProperty.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/property/StringProperty.java?rev=1188141&r1=1188140&r2=1188141&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/property/StringProperty.java
(original)
+++
jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/property/StringProperty.java
Mon Oct 24 13:11:39 2011
@@ -77,7 +77,7 @@ public class StringProperty extends Abst
* {@inheritDoc}
*/
@Override
- public Object clone() {
+ public StringProperty clone() {
StringProperty prop = (StringProperty) super.clone();
prop.value = value;
return prop;
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/property/TestElementProperty.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/property/TestElementProperty.java?rev=1188141&r1=1188140&r2=1188141&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/property/TestElementProperty.java
(original)
+++
jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/property/TestElementProperty.java
Mon Oct 24 13:11:39 2011
@@ -95,7 +95,7 @@ public class TestElementProperty extends
* {@inheritDoc}
*/
@Override
- public Object clone() {
+ public TestElementProperty clone() {
TestElementProperty prop = (TestElementProperty) super.clone();
prop.value = (TestElement) value.clone();
return prop;
Modified:
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/CookieManager.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/CookieManager.java?rev=1188141&r1=1188140&r2=1188141&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/CookieManager.java
(original)
+++
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/CookieManager.java
Mon Oct 24 13:11:39 2011
@@ -504,7 +504,7 @@ public class CookieManager extends Confi
if (getClearEachIteration()) {
log.debug("Initialise cookies from pre-defined list");
// No need to call clear
- setProperty((CollectionProperty)initialCookies.clone());
+ setProperty(initialCookies.clone());
}
}
Modified:
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/util/HTTPFileArg.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/util/HTTPFileArg.java?rev=1188141&r1=1188140&r2=1188141&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/util/HTTPFileArg.java
(original)
+++
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/util/HTTPFileArg.java
Mon Oct 24 13:11:39 2011
@@ -86,7 +86,7 @@ public class HTTPFileArg extends Abstrac
}
private void setProperty(String name, JMeterProperty prop) {
- JMeterProperty jmp = (JMeterProperty) prop.clone();
+ JMeterProperty jmp = prop.clone();
jmp.setName(name);
setProperty(jmp);
}
Modified: jakarta/jmeter/trunk/xdocs/changes.xml
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/xdocs/changes.xml?rev=1188141&r1=1188140&r2=1188141&view=diff
==============================================================================
--- jakarta/jmeter/trunk/xdocs/changes.xml (original)
+++ jakarta/jmeter/trunk/xdocs/changes.xml Mon Oct 24 13:11:39 2011
@@ -187,6 +187,7 @@ Mirror server now uses default port 8081
<li>Bug 51923 - Counter function bug or documentation issue ? (fixed docs)</li>
<li>Update velocity.jar to 1.7 (from 1.6.2)</li>
<li>Bug 51954 - Generated documents include </br> entries which cause
extra blank lines </li>
+<li>Bug 52075 - JMeterProperty.clone() currently returns Object; it should
return JMeterProperty</li>
</ul>
</section>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
