You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jmeter.apache.org by se...@apache.org on 2012/01/17 20:54:00 UTC
svn commit: r1232554 - in
/jmeter/trunk/src/core/org/apache/jmeter/save/converters:
MultiPropertyConverter.java TestElementConverter.java
TestElementPropertyConverter.java
Author: sebb
Date: Tue Jan 17 19:53:59 2012
New Revision: 1232554
URL: http://svn.apache.org/viewvc?rev=1232554&view=rev
Log:
Bug 52466 - Upgrade Test Plan feature : NameUpdater does not upgrade properties
Allow for deleted properties
Modified:
jmeter/trunk/src/core/org/apache/jmeter/save/converters/MultiPropertyConverter.java
jmeter/trunk/src/core/org/apache/jmeter/save/converters/TestElementConverter.java
jmeter/trunk/src/core/org/apache/jmeter/save/converters/TestElementPropertyConverter.java
Modified: jmeter/trunk/src/core/org/apache/jmeter/save/converters/MultiPropertyConverter.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/save/converters/MultiPropertyConverter.java?rev=1232554&r1=1232553&r2=1232554&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/save/converters/MultiPropertyConverter.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/save/converters/MultiPropertyConverter.java Tue Jan 17 19:53:59 2012
@@ -67,7 +67,9 @@ public class MultiPropertyConverter exte
while (reader.hasMoreChildren()) {
reader.moveDown();
JMeterProperty subProp = (JMeterProperty) readItem(reader, context, prop);
- prop.addProperty(subProp);
+ if (subProp != null) { // could be null if it has been deleted via NameUpdater
+ prop.addProperty(subProp);
+ }
reader.moveUp();
}
return prop;
Modified: jmeter/trunk/src/core/org/apache/jmeter/save/converters/TestElementConverter.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/save/converters/TestElementConverter.java?rev=1232554&r1=1232553&r2=1232554&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/save/converters/TestElementConverter.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/save/converters/TestElementConverter.java Tue Jan 17 19:53:59 2012
@@ -105,7 +105,9 @@ public class TestElementConverter extend
while (reader.hasMoreChildren()) {
reader.moveDown();
JMeterProperty prop = (JMeterProperty) readItem(reader, context, el);
- el.setProperty(prop);
+ if (prop != null) { // could be null if it has been deleted via NameUpdater
+ el.setProperty(prop);
+ }
reader.moveUp();
}
return el;
Modified: jmeter/trunk/src/core/org/apache/jmeter/save/converters/TestElementPropertyConverter.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/save/converters/TestElementPropertyConverter.java?rev=1232554&r1=1232553&r2=1232554&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/save/converters/TestElementPropertyConverter.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/save/converters/TestElementPropertyConverter.java Tue Jan 17 19:53:59 2012
@@ -112,15 +112,17 @@ public class TestElementPropertyConverte
while (reader.hasMoreChildren()) {
reader.moveDown();
JMeterProperty subProp = (JMeterProperty) readItem(reader, context, prop);
- if (isHeader) {
- String name = subProp.getName();
- if (TestElement.NAME.equals(name)) {
- subProp.setName("Header.name");// $NON-NLS-1$
- // Must be same as Header.HNAME - but that is built
- // later
+ if (subProp != null) { // could be null if it has been deleted via NameUpdater
+ if (isHeader) {
+ String name = subProp.getName();
+ if (TestElement.NAME.equals(name)) {
+ subProp.setName("Header.name");// $NON-NLS-1$
+ // Must be same as Header.HNAME - but that is built
+ // later
+ }
}
+ prop.addProperty(subProp);
}
- prop.addProperty(subProp);
reader.moveUp();
}
return prop;