Author: dkulp
Date: Fri Mar 28 11:38:42 2008
New Revision: 642328
URL: http://svn.apache.org/viewvc?rev=642328&view=rev
Log:
Fix some empty dirs being left in /tmp
Modified:
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxrs/BookServerResourceCreatedSpring.java
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxrs/BookServerResourceCreatedSpringProviders.java
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxrs/BookServerSpring.java
Modified:
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxrs/BookServerResourceCreatedSpring.java
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxrs/BookServerResourceCreatedSpring.java?rev=642328&r1=642327&r2=642328&view=diff
==============================================================================
---
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxrs/BookServerResourceCreatedSpring.java
(original)
+++
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxrs/BookServerResourceCreatedSpring.java
Fri Mar 28 11:38:42 2008
@@ -66,12 +66,13 @@
}
}
- public boolean stopInProcess() throws Exception {
- boolean ret = super.stopInProcess();
+ public void tearDown() throws Exception {
+ super.tearDown();
if (server != null) {
server.stop();
+ server.destroy();
+ server = null;
}
- return ret;
}
public static void main(String args[]) {
Modified:
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxrs/BookServerResourceCreatedSpringProviders.java
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxrs/BookServerResourceCreatedSpringProviders.java?rev=642328&r1=642327&r2=642328&view=diff
==============================================================================
---
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxrs/BookServerResourceCreatedSpringProviders.java
(original)
+++
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxrs/BookServerResourceCreatedSpringProviders.java
Fri Mar 28 11:38:42 2008
@@ -66,12 +66,13 @@
}
}
- public boolean stopInProcess() throws Exception {
- boolean ret = super.stopInProcess();
+ public void tearDown() throws Exception {
+ super.tearDown();
if (server != null) {
server.stop();
+ server.destroy();
+ server = null;
}
- return ret;
}
public static void main(String args[]) {
Modified:
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxrs/BookServerSpring.java
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxrs/BookServerSpring.java?rev=642328&r1=642327&r2=642328&view=diff
==============================================================================
---
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxrs/BookServerSpring.java
(original)
+++
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxrs/BookServerSpring.java
Fri Mar 28 11:38:42 2008
@@ -65,13 +65,13 @@
e.printStackTrace();
}
}
-
- public boolean stopInProcess() throws Exception {
- boolean ret = super.stopInProcess();
+ public void tearDown() throws Exception {
+ super.tearDown();
if (server != null) {
server.stop();
+ server.destroy();
+ server = null;
}
- return ret;
}
public static void main(String args[]) {
