Kaydet (Commit) 58d07a1e authored tarafından Robert Antoni Buj i Gelonch's avatar Robert Antoni Buj i Gelonch Kaydeden (comit) Michael Stahl

runner: Avoid a possible NullPointerException with tCase Object

Change-Id: Ie1202b7fa89306ea2a99031b9347b657039b839e
Reviewed-on: https://gerrit.libreoffice.org/11750Reviewed-by: 's avatarMichael Stahl <mstahl@redhat.com>
Tested-by: 's avatarMichael Stahl <mstahl@redhat.com>
üst af046d12
......@@ -217,32 +217,25 @@ public class java_fat_service implements TestBase {
log = (LogWriter)dcl.getInstance((String)param.get("LogWriter"));
param.getMSF();
TestCase tCase = null;
TestEnvironment tEnv = null;
try
{
tCase = (TestCase) dcl.getInstance("mod._"+entry.entryName);
}
catch (java.lang.IllegalArgumentException ie)
{
try {
TestCase tCase = (TestCase) dcl.getInstance("mod._"+entry.entryName);
log.println("Creating: " + tCase.getObjectName());
log.initialize(entry, true);
entry.UserDefinedParams = param;
tCase.setLogWriter((PrintWriter) log);
try {
tCase.initializeTestCase(param);
tEnv = tCase.getTestEnvironment(param);
} catch (com.sun.star.lang.DisposedException de) {
log.println("Office disposed");
}
} catch (java.lang.IllegalArgumentException ie) {
entry.ErrorMsg=ie.getMessage();
entry.hasErrorMsg=true;
}
log.println("Creating: "+tCase.getObjectName());
log.initialize(entry,true);
entry.UserDefinedParams = param;
tCase.setLogWriter((PrintWriter) log);
TestEnvironment tEnv = null;
try
{
tCase.initializeTestCase(param);
tEnv = tCase.getTestEnvironment(param);
}
catch (com.sun.star.lang.DisposedException de)
{
log.println("Office disposed");
}
return tEnv;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment