Author: sebb
Date: Sat May 3 14:46:02 2008
New Revision: 653147
URL: http://svn.apache.org/viewvc?rev=653147&view=rev
Log:
Avoid possible NPE
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/property/AbstractProperty.java
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=653147&r1=653146&r2=653147&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
Sat May 3 14:46:02 2008
@@ -308,6 +308,7 @@
newColl = (Collection)
coll.getClass().newInstance();
} catch (Exception e) {
log.error("Bad collection", e);
+ return coll;
}
}
newColl.add(convertObject(item));
@@ -335,6 +336,7 @@
newColl = (Map)
coll.getClass().newInstance();
} catch (Exception e) {
log.error("Bad collection", e);
+ return coll;
}
}
newColl.put(item, convertObject(prop));
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
