Author: sebb
Date: Sat Sep 17 15:27:10 2011
New Revision: 1172003
URL: http://svn.apache.org/viewvc?rev=1172003&view=rev
Log:
Avoid NPE if Paste is used before Copy
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/Copy.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/Paste.java
Modified: jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/Copy.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/Copy.java?rev=1172003&r1=1172002&r2=1172003&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/Copy.java
(original)
+++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/Copy.java Sat
Sep 17 15:27:10 2011
@@ -63,6 +63,9 @@ public class Copy extends AbstractAction
}
public static JMeterTreeNode[] getCopiedNodes() {
+ if (copiedNodes == null) { // can be null if Copy has yet to be used
+ return null;
+ }
for (int i = 0; i < copiedNodes.length; i++) {
if (copiedNodes[i] == null) {
return null;
Modified: jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/Paste.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/Paste.java?rev=1172003&r1=1172002&r2=1172003&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/Paste.java
(original)
+++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/Paste.java Sat
Sep 17 15:27:10 2011
@@ -60,6 +60,10 @@ public class Paste extends AbstractActio
@Override
public void doAction(ActionEvent e) {
JMeterTreeNode draggedNodes[] = Copy.getCopiedNodes();
+ if (draggedNodes == null) {
+ Toolkit.getDefaultToolkit().beep();
+ return;
+ }
JMeterTreeListener treeListener =
GuiPackage.getInstance().getTreeListener();
JMeterTreeNode currentNode = treeListener.getCurrentNode();
if (MenuFactory.canAddTo(currentNode, draggedNodes)) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
