sebb 2005/03/11 18:56:15
Modified: src/core/org/apache/jmeter/gui/action Tag: rel-2_0 Load.java
Log:
Bug 33921 - merge should not change file name
Revision Changes Path
No revision
No revision
1.23.2.1 +5 -4
jakarta-jmeter/src/core/org/apache/jmeter/gui/action/Load.java
Index: Load.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/gui/action/Load.java,v
retrieving revision 1.23
retrieving revision 1.23.2.1
diff -u -r1.23 -r1.23.2.1
--- Load.java 13 Feb 2004 02:21:36 -0000 1.23
+++ Load.java 12 Mar 2005 02:56:15 -0000 1.23.2.1
@@ -113,7 +113,8 @@
GuiPackage.getInstance().updateCurrentGui();
GuiPackage.getInstance().getMainFrame().repaint();
}
- if (isTestPlan && f != null)
+ // don't change name if merging
+ if (!merging && isTestPlan && f != null)
{
(
(Save) ActionRouter.getInstance().getAction(
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
