jboutcher 02/03/15 04:36:08
Modified: src/org/apache/jmeter/gui JMeterMenuBar.java
Log:
fix of bugzilla 7010 - possible npe situations addressed in code
Revision Changes Path
1.18 +10 -3 jakarta-jmeter/src/org/apache/jmeter/gui/JMeterMenuBar.java
Index: JMeterMenuBar.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/org/apache/jmeter/gui/JMeterMenuBar.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- JMeterMenuBar.java 4 Mar 2002 23:08:54 -0000 1.17
+++ JMeterMenuBar.java 15 Mar 2002 12:36:08 -0000 1.18
@@ -129,12 +129,16 @@
public void setFileLoadEnabled(boolean enabled)
{
- file_load.setEnabled(enabled);
+ if(file_load != null) {
+ file_load.setEnabled(enabled);
+ }
}
public void setEditEnabled(boolean enabled)
{
- editMenu.setEnabled(enabled);
+ if(editMenu != null) {
+ editMenu.setEnabled(enabled);
+ }
}
public void setEditAddMenu(JMenu menu)
@@ -152,7 +156,10 @@
public void setEditAddEnabled(boolean enabled)
{
- edit_add.setEnabled(enabled);
+ // There was a NPE being thrown without the null check here.. JKB
+ if(edit_add != null) {
+ edit_add.setEnabled(enabled);
+ }
// If we are enabling the Edit-->Add menu item, then we also need to
// enable the Edit menu. The Edit menu may already be enabled, but
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
