mstover1 2003/06/11 07:32:00
Modified: src/core/org/apache/jmeter/gui/action Load.java
src/core/org/apache/jmeter/util JMeterUtils.java
Log:
Fixing error messages when JMeter can't load old JMeter .jmx files
Revision Changes Path
1.17 +15 -7 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.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- Load.java 14 May 2003 19:27:54 -0000 1.16
+++ Load.java 11 Jun 2003 14:32:00 -0000 1.17
@@ -78,7 +78,7 @@
import org.apache.jmeter.testelement.TestPlan;
import org.apache.jmeter.util.JMeterUtils;
import org.apache.jorphan.collections.HashTree;
-import org.apache.log.Hierarchy;
+import org.apache.jorphan.logging.LoggingManager;
import org.apache.log.Logger;
/****************************************
@@ -90,8 +90,7 @@
***************************************/
public class Load implements Command
{
- transient private static Logger log =
Hierarchy.getDefaultHierarchy().getLoggerFor(
- "jmeter.gui");
+ transient private static Logger log = LoggingManager.getLoggerForClass();
private static Set commands = new HashSet();
static
@@ -134,6 +133,7 @@
f = chooser.getSelectedFile();
if(f != null)
{
+ log.info("Loading file: "+f);
reader = new FileInputStream(f);
HashTree tree = SaveService.loadSubTree(reader);
isTestPlan = insertLoadedTree(e.getID(), tree);
@@ -141,7 +141,12 @@
}
catch(Exception ex)
{
- JMeterUtils.reportErrorToUser(ex.getMessage());
+ String msg = ex.getMessage();
+ if (msg == null) {
+ msg="Unexpected error - see log for details";
+ log.warn("Unexpected error",ex);
+ }
+ JMeterUtils.reportErrorToUser(msg);
}
finally
{
@@ -160,6 +165,9 @@
* */
public boolean insertLoadedTree(int id, HashTree tree) throws Exception,
IllegalUserActionException {
//convertTree(tree);
+ if (tree == null){
+ throw new Exception("Error in TestPlan - see log file");
+ }
boolean isTestPlan = tree.getArray()[0] instanceof TestPlan;
HashTree newTree = GuiPackage.getInstance().addSubTree(tree);
GuiPackage.getInstance().updateCurrentGui();
1.30 +6 -14 jakarta-jmeter/src/core/org/apache/jmeter/util/JMeterUtils.java
Index: JMeterUtils.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/util/JMeterUtils.java,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- JMeterUtils.java 11 Jun 2003 14:08:14 -0000 1.29
+++ JMeterUtils.java 11 Jun 2003 14:32:00 -0000 1.30
@@ -82,7 +82,6 @@
import org.apache.jmeter.gui.GuiPackage;
import org.apache.jorphan.logging.LoggingManager;
import org.apache.jorphan.test.UnitTestManager;
-import org.apache.log.Hierarchy;
import org.apache.log.Logger;
import org.apache.oro.text.PatternCacheLRU;
import org.apache.oro.text.regex.Perl5Compiler;
@@ -100,11 +99,7 @@
private static final String VERSION="1.9.RC20030611";
private static PatternCacheLRU patternCache = new PatternCacheLRU(1000,new
Perl5Compiler());
- transient private static Logger log =
- Hierarchy.getDefaultHierarchy().getLoggerFor("jmeter.util");
- private static LoggingManager logManager;
- private static String LOG_FILE = "log_file";
- private static String LOG_PRIORITY = "log_level";
+ transient private static Logger log = LoggingManager.getLoggerForClass();
private static final SAXParserFactory xmlFactory;
static {
SAXParserFactory temp = null;
@@ -821,8 +816,6 @@
{
return new String[0];
}
- StringTokenizer tokens;
- String temp;
int spot;
while ((spot = splittee.indexOf(splitChar + splitChar)) != -1)
{
@@ -858,6 +851,10 @@
*/
public static void reportErrorToUser(String errorMsg)
{
+ if (errorMsg == null){
+ errorMsg = "Unknown error - see log file";
+ log.warn("Unknown error",new Throwable("errorMsg == null"));
+ }
JOptionPane.showMessageDialog(
GuiPackage.getInstance().getMainFrame(),
errorMsg,
@@ -977,11 +974,6 @@
return VERSION;
}
}
-
-
-
-
-
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
