Author: sebb
Date: Thu Sep 22 17:12:22 2011
New Revision: 1174269
URL: http://svn.apache.org/viewvc?rev=1174269&view=rev
Log:
Bug 51869 - NullPointer Exception when using Include Controller
Modified:
jakarta/jmeter/trunk/src/components/org/apache/jmeter/control/IncludeController.java
jakarta/jmeter/trunk/xdocs/changes.xml
Modified:
jakarta/jmeter/trunk/src/components/org/apache/jmeter/control/IncludeController.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/components/org/apache/jmeter/control/IncludeController.java?rev=1174269&r1=1174268&r2=1174269&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/components/org/apache/jmeter/control/IncludeController.java
(original)
+++
jakarta/jmeter/trunk/src/components/org/apache/jmeter/control/IncludeController.java
Thu Sep 22 17:12:22 2011
@@ -78,7 +78,7 @@ public class IncludeController extends G
}
}
clone.SUBTREE = (HashTree)this.SUBTREE.clone();
- clone.SUB = (TestElement)this.SUB.clone();
+ clone.SUB = this.SUB==null ? null : (TestElement) this.SUB.clone();
}
return clone;
}
Modified: jakarta/jmeter/trunk/xdocs/changes.xml
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/xdocs/changes.xml?rev=1174269&r1=1174268&r2=1174269&view=diff
==============================================================================
--- jakarta/jmeter/trunk/xdocs/changes.xml (original)
+++ jakarta/jmeter/trunk/xdocs/changes.xml Thu Sep 22 17:12:22 2011
@@ -106,6 +106,7 @@ This can be overridden by setting the JM
<ul>
<li>If Controller - Fixed two regressions introduced by bug 50032 (see bug
50618 too)</li>
<li>If Controller - Catches a StackOverflowError when a condition returns
always false (after at least one iteration with return true) See bug 50618</li>
+<li>Bug 51869 - NullPointer Exception when using Include Controller</li>
</ul>
<h3>Listeners</h3>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
