You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jmeter-dev@jakarta.apache.org by se...@apache.org on 2007/06/03 17:21:11 UTC
svn commit: r543919 - in
/jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/testelement:
AbstractTestElement.java property/AbstractProperty.java
Author: sebb
Date: Sun Jun 3 08:21:10 2007
New Revision: 543919
URL: http://svn.apache.org/viewvc?view=rev&rev=543919
Log:
Clone should never return null
Modified:
jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/testelement/AbstractTestElement.java
jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/testelement/property/AbstractProperty.java
Modified: jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/testelement/AbstractTestElement.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/testelement/AbstractTestElement.java?view=diff&rev=543919&r1=543918&r2=543919
==============================================================================
--- jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/testelement/AbstractTestElement.java (original)
+++ jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/testelement/AbstractTestElement.java Sun Jun 3 08:21:10 2007
@@ -59,19 +59,20 @@
private transient String threadName = null;
public Object clone() {
- TestElement clonedElement = null;
try {
- clonedElement = (TestElement) this.getClass().newInstance();
+ TestElement clonedElement = (TestElement) this.getClass().newInstance();
PropertyIterator iter = propertyIterator();
while (iter.hasNext()) {
clonedElement.setProperty((JMeterProperty) iter.next().clone());
}
clonedElement.setRunningVersion(runningVersion);
+ return clonedElement;
} catch (InstantiationException e) {
+ throw new AssertionError(e); // clone should never return null
} catch (IllegalAccessException e) {
+ throw new AssertionError(e); // clone should never return null
}
- return clonedElement;
}
public void clear() {
Modified: jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/testelement/property/AbstractProperty.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/testelement/property/AbstractProperty.java?view=diff&rev=543919&r1=543918&r2=543919
==============================================================================
--- jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/testelement/property/AbstractProperty.java (original)
+++ jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/testelement/property/AbstractProperty.java Sun Jun 3 08:21:10 2007
@@ -106,9 +106,9 @@
prop.runningVersion = runningVersion;
return prop;
} catch (InstantiationException e) {
- return null;
+ throw new AssertionError(e); // clone should never return null
} catch (IllegalAccessException e) {
- return null;
+ throw new AssertionError(e); // clone should never return null
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: jmeter-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: jmeter-dev-help@jakarta.apache.org