Author: sebb
Date: Sat May 9 03:14:47 2009
New Revision: 773157
URL: http://svn.apache.org/viewvc?rev=773157&view=rev
Log:
Avoid NPE in serialisation tests
Modified:
jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/gui/JLabeledChoice.java
jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/gui/JLabeledTextField.java
Modified:
jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/gui/JLabeledChoice.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/gui/JLabeledChoice.java?rev=773157&r1=773156&r2=773157&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/gui/JLabeledChoice.java
(original)
+++ jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/gui/JLabeledChoice.java
Sat May 9 03:14:47 2009
@@ -236,6 +236,9 @@
* @return the text of the tool tip
*/
public String getToolTipText() {
+ if (choiceList == null){ // Necessary to avoid NPE when testing
serialisation
+ return null;
+ }
return choiceList.getToolTipText();
}
Modified:
jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/gui/JLabeledTextField.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/gui/JLabeledTextField.java?rev=773157&r1=773156&r2=773157&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/gui/JLabeledTextField.java
(original)
+++
jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/gui/JLabeledTextField.java
Sat May 9 03:14:47 2009
@@ -46,7 +46,7 @@
private JTextField mTextField;
// Maybe move to vector if MT problems occur
- private ArrayList mChangeListeners = new ArrayList(3);
+ private final ArrayList mChangeListeners = new ArrayList(3);
// A temporary cache for the focus listener
private String oldValue = "";
@@ -190,7 +190,10 @@
* @return the text of the tool tip
*/
public String getToolTipText() {
- return mTextField.getToolTipText();
+ if (mTextField == null){ // Necessary to avoid NPE when testing
serialisation
+ return null;
+ }
+ return mTextField.getToolTipText();
}
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
