Author: sebb
Date: Wed Jan 16 15:20:46 2008
New Revision: 612621

URL: http://svn.apache.org/viewvc?rev=612621&view=rev
Log:
Handle null wrapper better

Modified:
    jakarta/jmeter/trunk/src/core/org/apache/jmeter/save/SaveService.java

Modified: jakarta/jmeter/trunk/src/core/org/apache/jmeter/save/SaveService.java
URL: 
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/save/SaveService.java?rev=612621&r1=612620&r2=612621&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/core/org/apache/jmeter/save/SaveService.java 
(original)
+++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/save/SaveService.java Wed 
Jan 16 15:20:46 2008
@@ -396,6 +396,10 @@
                        InputStreamReader inputStreamReader = 
getInputStreamReader(reader);
                        wrapper = (ScriptWrapper) 
saver.fromXML(inputStreamReader);
                        inputStreamReader.close();
+                       if (wrapper == null){
+                               log.warn("Problem loading new style: see 
above.");
+                               return null;
+                       }
                        return wrapper.testPlan;
                } catch (CannotResolveClassException e) {
                        log.warn("Problem loading new style: " + 
e.getLocalizedMessage());



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to