Author: alessio.soldano(a)jboss.com
Date: 2013-03-18 13:57:49 -0400 (Mon, 18 Mar 2013)
New Revision: 17396
Modified:
shared-testsuite/branches/jbossws-shared-testsuite-4.1.x/src/main/java/org/jboss/wsf/test/AppclientHelper.java
Log:
[BZ-921111] Backporting fix for adding few NPE checks on AppclientHelper to avoid hiding
other exceptional conditions that led to premature undeploy..
Modified:
shared-testsuite/branches/jbossws-shared-testsuite-4.1.x/src/main/java/org/jboss/wsf/test/AppclientHelper.java
===================================================================
---
shared-testsuite/branches/jbossws-shared-testsuite-4.1.x/src/main/java/org/jboss/wsf/test/AppclientHelper.java 2013-03-18
17:54:33 UTC (rev 17395)
+++
shared-testsuite/branches/jbossws-shared-testsuite-4.1.x/src/main/java/org/jboss/wsf/test/AppclientHelper.java 2013-03-18
17:57:49 UTC (rev 17396)
@@ -94,10 +94,19 @@
finally
{
s.release();
- ap.outTask.kill();
- ap.errTask.kill();
- ap.process.destroy();
- ap.log.close();
+ //NPE checks to avoid hiding other exceptional conditions that led to premature
undeploy..
+ if (ap.output != null) {
+ ap.outTask.kill();
+ }
+ if (ap.errTask != null) {
+ ap.errTask.kill();
+ }
+ if (ap.process != null) {
+ ap.process.destroy();
+ }
+ if (ap.log != null) {
+ ap.log.close();
+ }
}
}
Show replies by date