View | Details | Raw Unified | Return to bug 62683
Collapse All | Expand All

(-)a/src/core/org/apache/jmeter/gui/action/Load.java (-1 / +7 lines)
Lines 44-49 import org.slf4j.Logger; Link Here
44
import org.slf4j.LoggerFactory;
44
import org.slf4j.LoggerFactory;
45
45
46
import com.thoughtworks.xstream.converters.ConversionException;
46
import com.thoughtworks.xstream.converters.ConversionException;
47
import com.thoughtworks.xstream.io.StreamException;
47
48
48
/**
49
/**
49
 * Handles the Open (load a new file) and Merge commands.
50
 * Handles the Open (load a new file) and Merge commands.
Lines 144-149 public class Load extends AbstractActionWithNoRunningTest { Link Here
144
                JMeterUtils.reportErrorToUser(SaveService.CEtoString(ex));
145
                JMeterUtils.reportErrorToUser(SaveService.CEtoString(ex));
145
            } catch (IOException ex) {
146
            } catch (IOException ex) {
146
                reportError("Error reading file. {}", ex, false);
147
                reportError("Error reading file. {}", ex, false);
148
            } catch (StreamException ex) {
149
                Throwable exceptionToDisplay = ex;
150
                if ("".equals(ex.getMessage()) && ex.getCause() != null) {
151
                    exceptionToDisplay = ex.getCause();
152
                }
153
                reportError("Error in XML format. {}", exceptionToDisplay, false);
147
            } catch (Exception ex) {
154
            } catch (Exception ex) {
148
                reportError("Unexpected error. {}", ex, true);
155
                reportError("Unexpected error. {}", ex, true);
149
            }
156
            }
150
- 

Return to bug 62683