Author: dkulp
Date: Thu Aug 12 19:53:06 2010
New Revision: 984933
URL: http://svn.apache.org/viewvc?rev=984933&view=rev
Log:
Hold onto defs strongly after modifying them to make sure changes stay
in memory (fixes some random test failures)
Modified:
cxf/trunk/systests/transports/src/test/java/org/apache/cxf/jms/testsuite/testcases/AbstractSOAPJMSTestSuite.java
cxf/trunk/systests/transports/src/test/java/org/apache/cxf/systest/jms/JMSClientServerTest.java
cxf/trunk/systests/transports/src/test/java/org/apache/cxf/systest/jms/Server.java
cxf/trunk/systests/transports/src/test/java/org/apache/cxf/systest/jms/continuations/HelloWorldContinuationsThrottleTest.java
cxf/trunk/systests/transports/src/test/java/org/apache/cxf/systest/jms/continuations/JMSContinuationsClientServerTest.java
cxf/trunk/systests/transports/src/test/java/org/apache/cxf/systest/jms/continuations/Server.java
cxf/trunk/systests/transports/src/test/java/org/apache/cxf/systest/jms/continuations/Server2.java
cxf/trunk/systests/transports/src/test/java/org/apache/cxf/systest/jms/continuations/Server3.java
cxf/trunk/systests/transports/src/test/java/org/apache/cxf/systest/jms/tx/JMSTransactionClientServerTest.java
cxf/trunk/systests/transports/src/test/java/org/apache/cxf/systest/multitransport/MultiTransportClientServerTest.java
cxf/trunk/systests/uncategorized/src/test/java/org/apache/cxf/systest/factory_pattern/MultiplexClientServerTest.java
cxf/trunk/testutils/src/main/java/org/apache/cxf/testutil/common/EmbeddedJMSBrokerLauncher.java
Modified:
cxf/trunk/systests/transports/src/test/java/org/apache/cxf/jms/testsuite/testcases/AbstractSOAPJMSTestSuite.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/systests/transports/src/test/java/org/apache/cxf/jms/testsuite/testcases/AbstractSOAPJMSTestSuite.java?rev=984933&r1=984932&r2=984933&view=diff
==============================================================================
---
cxf/trunk/systests/transports/src/test/java/org/apache/cxf/jms/testsuite/testcases/AbstractSOAPJMSTestSuite.java
(original)
+++
cxf/trunk/systests/transports/src/test/java/org/apache/cxf/jms/testsuite/testcases/AbstractSOAPJMSTestSuite.java
Thu Aug 12 19:53:06 2010
@@ -26,6 +26,7 @@ import javax.jms.Destination;
import javax.jms.JMSException;
import javax.jms.Message;
import javax.jms.Session;
+import javax.wsdl.Definition;
import javax.xml.namespace.QName;
import javax.xml.ws.Service;
@@ -60,7 +61,8 @@ public abstract class AbstractSOAPJMSTes
QName qServiceName = new QName(namespace, serviceName);
QName qPortName = new QName(namespace, portName);
URL wsdl = getClass().getResource("/wsdl/jms_spec_testsuite.wsdl");
- EmbeddedJMSBrokerLauncher.updateWsdlExtensors(getBus(),
wsdl.toString());
+ Definition def =
EmbeddedJMSBrokerLauncher.updateWsdlExtensors(getBus(), wsdl.toString());
+ assertNotNull(def);
BusFactory.setThreadDefaultBus(getBus());
BusFactory.setDefaultBus(getBus());
Class<? extends Service> svcls =
serviceClass.asSubclass(Service.class);
Modified:
cxf/trunk/systests/transports/src/test/java/org/apache/cxf/systest/jms/JMSClientServerTest.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/systests/transports/src/test/java/org/apache/cxf/systest/jms/JMSClientServerTest.java?rev=984933&r1=984932&r2=984933&view=diff
==============================================================================
---
cxf/trunk/systests/transports/src/test/java/org/apache/cxf/systest/jms/JMSClientServerTest.java
(original)
+++
cxf/trunk/systests/transports/src/test/java/org/apache/cxf/systest/jms/JMSClientServerTest.java
Thu Aug 12 19:53:06 2010
@@ -34,6 +34,7 @@ import javax.jms.Destination;
import javax.jms.JMSException;
import javax.jms.Message;
import javax.jms.Session;
+import javax.wsdl.Definition;
import javax.xml.namespace.QName;
import javax.xml.ws.AsyncHandler;
import javax.xml.ws.Binding;
@@ -103,6 +104,9 @@ import org.springframework.jndi.JndiTemp
public class JMSClientServerTest extends AbstractBusClientServerTestBase {
static final String JMS_PORT = EmbeddedJMSBrokerLauncher.PORT;
static final String PORT = Server.PORT;
+
+ private Definition definition;
+
@BeforeClass
public static void startServers() throws Exception {
Map<String, String> props = new HashMap<String, String>();
@@ -122,7 +126,8 @@ public class JMSClientServerTest extends
public URL getWSDLURL(String s) throws Exception {
URL u = getClass().getResource(s);
- EmbeddedJMSBrokerLauncher.updateWsdlExtensors(getBus(), u.toString());
+ definition = EmbeddedJMSBrokerLauncher.updateWsdlExtensors(getBus(),
u.toString());
+ assertNotNull(definition);
return u;
}
public QName getServiceName(QName q) {
@@ -471,8 +476,9 @@ public class JMSClientServerTest extends
ClassPathXmlApplicationContext ctx =
new ClassPathXmlApplicationContext(
new String[] {"/org/apache/cxf/systest/jms/JMSClients.xml"});
- EmbeddedJMSBrokerLauncher.updateWsdlExtensors((Bus)ctx.getBean("cxf"),
-
"classpath:wsdl/jms_test.wsdl");
+ Definition def =
EmbeddedJMSBrokerLauncher.updateWsdlExtensors((Bus)ctx.getBean("cxf"),
+
"classpath:wsdl/jms_test.wsdl");
+ assertNotNull(def);
HelloWorldPortType greeter =
(HelloWorldPortType)ctx.getBean("jmsRPCClient");
assertNotNull(greeter);
@@ -553,8 +559,11 @@ public class JMSClientServerTest extends
"HelloWorldQueueDecoupledOneWaysPort"));
URL wsdl = getWSDLURL("/wsdl/jms_test.wsdl");
assertNotNull(wsdl);
- EmbeddedJMSBrokerLauncher.updateWsdlExtensors(getBus(),
wsdl.toString());
- EmbeddedJMSBrokerLauncher.updateWsdlExtensors(getBus(),
"testutils/jms_test.wsdl");
+ Definition def1 =
EmbeddedJMSBrokerLauncher.updateWsdlExtensors(getBus(), wsdl.toString());
+ Definition def2 =
EmbeddedJMSBrokerLauncher.updateWsdlExtensors(getBus(),
"testutils/jms_test.wsdl");
+ assertNotNull(def1);
+ assertNotNull(def2);
+
HelloWorldQueueDecoupledOneWaysService service =
new HelloWorldQueueDecoupledOneWaysService(wsdl, serviceName);
@@ -623,7 +632,8 @@ public class JMSClientServerTest extends
"HelloWorldQueueDecoupledOneWaysPort"));
URL wsdl = getWSDLURL("/wsdl/jms_test.wsdl");
assertNotNull(wsdl);
- EmbeddedJMSBrokerLauncher.updateWsdlExtensors(getBus(),
"testutils/jms_test.wsdl");
+ Definition def =
EmbeddedJMSBrokerLauncher.updateWsdlExtensors(getBus(),
"testutils/jms_test.wsdl");
+ assertNotNull(def);
HelloWorldQueueDecoupledOneWaysService service =
new HelloWorldQueueDecoupledOneWaysService(wsdl, serviceName);
Modified:
cxf/trunk/systests/transports/src/test/java/org/apache/cxf/systest/jms/Server.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/systests/transports/src/test/java/org/apache/cxf/systest/jms/Server.java?rev=984933&r1=984932&r2=984933&view=diff
==============================================================================
---
cxf/trunk/systests/transports/src/test/java/org/apache/cxf/systest/jms/Server.java
(original)
+++
cxf/trunk/systests/transports/src/test/java/org/apache/cxf/systest/jms/Server.java
Thu Aug 12 19:53:06 2010
@@ -18,6 +18,7 @@
*/
package org.apache.cxf.systest.jms;
+import javax.wsdl.Definition;
import javax.xml.ws.Binding;
import javax.xml.ws.Endpoint;
import javax.xml.ws.soap.SOAPBinding;
@@ -32,7 +33,10 @@ import org.apache.cxf.transport.jms.spec
public class Server extends AbstractBusTestServerBase {
public static final String PORT = allocatePort(Server.class);
-
+ Definition def1;
+ Definition def2;
+ Definition def3;
+
protected void run() {
Object implementor = new GreeterImplTwoWayJMS();
Object impl2 = new GreeterImplQueueOneWay();
@@ -53,9 +57,10 @@ public class Server extends AbstractBusT
Object mtom = new JMSMTOMImpl();
Bus bus = BusFactory.getDefaultBus();
- EmbeddedJMSBrokerLauncher.updateWsdlExtensors(bus,
"testutils/hello_world_doc_lit.wsdl");
- EmbeddedJMSBrokerLauncher.updateWsdlExtensors(bus,
"testutils/jms_test.wsdl");
- EmbeddedJMSBrokerLauncher.updateWsdlExtensors(bus,
"testutils/jms_test_mtom.wsdl");
+ def1 = EmbeddedJMSBrokerLauncher.updateWsdlExtensors(bus,
"testutils/hello_world_doc_lit.wsdl");
+ def2 = EmbeddedJMSBrokerLauncher.updateWsdlExtensors(bus,
"testutils/jms_test.wsdl");
+ def3 = EmbeddedJMSBrokerLauncher.updateWsdlExtensors(bus,
"testutils/jms_test_mtom.wsdl");
+
Endpoint.publish(null, impleDoc);
String address = "http://localhost:"; + PORT + "/SoapContext/SoapPort";
Endpoint.publish(address, implementor);
Modified:
cxf/trunk/systests/transports/src/test/java/org/apache/cxf/systest/jms/continuations/HelloWorldContinuationsThrottleTest.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/systests/transports/src/test/java/org/apache/cxf/systest/jms/continuations/HelloWorldContinuationsThrottleTest.java?rev=984933&r1=984932&r2=984933&view=diff
==============================================================================
---
cxf/trunk/systests/transports/src/test/java/org/apache/cxf/systest/jms/continuations/HelloWorldContinuationsThrottleTest.java
(original)
+++
cxf/trunk/systests/transports/src/test/java/org/apache/cxf/systest/jms/continuations/HelloWorldContinuationsThrottleTest.java
Thu Aug 12 19:53:06 2010
@@ -26,6 +26,7 @@ import java.util.concurrent.CountDownLat
import java.util.concurrent.ThreadPoolExecutor;
import java.util.concurrent.TimeUnit;
+import javax.wsdl.Definition;
import javax.xml.namespace.QName;
import org.apache.cxf.Bus;
@@ -76,7 +77,8 @@ public class HelloWorldContinuationsThro
QName serviceName = new QName("http://cxf.apache.org/systest/jaxws";,
"HelloContinuationService");
URL wsdlURL =
getClass().getResource("/org/apache/cxf/systest/jms/continuations/test2.wsdl");
- EmbeddedJMSBrokerLauncher.updateWsdlExtensors(getBus(),
wsdlURL.toString());
+ Definition def =
EmbeddedJMSBrokerLauncher.updateWsdlExtensors(getBus(), wsdlURL.toString());
+ assertNotNull(def);
HelloContinuationService service = new
HelloContinuationService(wsdlURL, serviceName);
assertNotNull(service);
final HelloContinuation helloPort = service.getHelloContinuationPort();
Modified:
cxf/trunk/systests/transports/src/test/java/org/apache/cxf/systest/jms/continuations/JMSContinuationsClientServerTest.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/systests/transports/src/test/java/org/apache/cxf/systest/jms/continuations/JMSContinuationsClientServerTest.java?rev=984933&r1=984932&r2=984933&view=diff
==============================================================================
---
cxf/trunk/systests/transports/src/test/java/org/apache/cxf/systest/jms/continuations/JMSContinuationsClientServerTest.java
(original)
+++
cxf/trunk/systests/transports/src/test/java/org/apache/cxf/systest/jms/continuations/JMSContinuationsClientServerTest.java
Thu Aug 12 19:53:06 2010
@@ -22,6 +22,7 @@ import java.net.URL;
import java.util.HashMap;
import java.util.Map;
+import javax.wsdl.Definition;
import javax.xml.namespace.QName;
import org.apache.cxf.hello_world_jms.HelloWorldPortType;
@@ -77,7 +78,8 @@ public class JMSContinuationsClientServe
URL wsdl =
getWSDLURL("/org/apache/cxf/systest/jms/continuations/jms_test.wsdl");
assertNotNull(wsdl);
- EmbeddedJMSBrokerLauncher.updateWsdlExtensors(getBus(),
wsdl.toString());
+ Definition def =
EmbeddedJMSBrokerLauncher.updateWsdlExtensors(getBus(), wsdl.toString());
+ assertNotNull(def);
HelloWorldService service = new HelloWorldService(wsdl, serviceName);
assertNotNull(service);
Modified:
cxf/trunk/systests/transports/src/test/java/org/apache/cxf/systest/jms/continuations/Server.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/systests/transports/src/test/java/org/apache/cxf/systest/jms/continuations/Server.java?rev=984933&r1=984932&r2=984933&view=diff
==============================================================================
---
cxf/trunk/systests/transports/src/test/java/org/apache/cxf/systest/jms/continuations/Server.java
(original)
+++
cxf/trunk/systests/transports/src/test/java/org/apache/cxf/systest/jms/continuations/Server.java
Thu Aug 12 19:53:06 2010
@@ -18,6 +18,7 @@
*/
package org.apache.cxf.systest.jms.continuations;
+import javax.wsdl.Definition;
import javax.xml.ws.Endpoint;
import org.apache.cxf.BusFactory;
@@ -26,10 +27,10 @@ import org.apache.cxf.testutil.common.Em
public class Server extends AbstractBusTestServerBase {
public static final String PORT = allocatePort(Server.class);
-
+ Definition def;
protected void run() {
-
EmbeddedJMSBrokerLauncher.updateWsdlExtensors(BusFactory.getDefaultBus(),
+ def =
EmbeddedJMSBrokerLauncher.updateWsdlExtensors(BusFactory.getDefaultBus(),
"testutils/jms_test.wsdl");
Object implementor = new GreeterImplWithContinuationsJMS();
Modified:
cxf/trunk/systests/transports/src/test/java/org/apache/cxf/systest/jms/continuations/Server2.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/systests/transports/src/test/java/org/apache/cxf/systest/jms/continuations/Server2.java?rev=984933&r1=984932&r2=984933&view=diff
==============================================================================
---
cxf/trunk/systests/transports/src/test/java/org/apache/cxf/systest/jms/continuations/Server2.java
(original)
+++
cxf/trunk/systests/transports/src/test/java/org/apache/cxf/systest/jms/continuations/Server2.java
Thu Aug 12 19:53:06 2010
@@ -18,6 +18,7 @@
*/
package org.apache.cxf.systest.jms.continuations;
+import javax.wsdl.Definition;
import javax.xml.ws.Endpoint;
import org.apache.cxf.BusFactory;
@@ -26,10 +27,11 @@ import org.apache.cxf.testutil.common.Em
public class Server2 extends AbstractBusTestServerBase {
public static final String PORT = allocatePort(Server2.class);
+ Definition def;
protected void run() {
-
EmbeddedJMSBrokerLauncher.updateWsdlExtensors(BusFactory.getDefaultBus(),
+ def =
EmbeddedJMSBrokerLauncher.updateWsdlExtensors(BusFactory.getDefaultBus(),
"org/apache/cxf/systest/jms/continuations/test.wsdl");
Object implementor = new HelloWorldWithContinuationsJMS();
String address = "http://localhost:"; + PORT + "/SoapContext/SoapPort";
Modified:
cxf/trunk/systests/transports/src/test/java/org/apache/cxf/systest/jms/continuations/Server3.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/systests/transports/src/test/java/org/apache/cxf/systest/jms/continuations/Server3.java?rev=984933&r1=984932&r2=984933&view=diff
==============================================================================
---
cxf/trunk/systests/transports/src/test/java/org/apache/cxf/systest/jms/continuations/Server3.java
(original)
+++
cxf/trunk/systests/transports/src/test/java/org/apache/cxf/systest/jms/continuations/Server3.java
Thu Aug 12 19:53:06 2010
@@ -18,6 +18,7 @@
*/
package org.apache.cxf.systest.jms.continuations;
+import javax.wsdl.Definition;
import javax.xml.ws.Endpoint;
import org.apache.cxf.Bus;
@@ -32,11 +33,13 @@ public class Server3 extends AbstractBus
private static final String CONFIG_FILE =
"org/apache/cxf/systest/jms/continuations/jms_test_config.xml";
+ Definition def;
+
protected void run() {
SpringBusFactory bf = new SpringBusFactory();
Bus bus = bf.createBus(CONFIG_FILE);
BusFactory.setDefaultBus(bus);
- EmbeddedJMSBrokerLauncher.updateWsdlExtensors(bus,
+ def = EmbeddedJMSBrokerLauncher.updateWsdlExtensors(bus,
"org/apache/cxf/systest/jms/continuations/test2.wsdl");
Object implementor = new HelloWorldWithContinuationsJMS2();
String address = "http://localhost:"; + PORT + "/SoapContext/SoapPort";
Modified:
cxf/trunk/systests/transports/src/test/java/org/apache/cxf/systest/jms/tx/JMSTransactionClientServerTest.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/systests/transports/src/test/java/org/apache/cxf/systest/jms/tx/JMSTransactionClientServerTest.java?rev=984933&r1=984932&r2=984933&view=diff
==============================================================================
---
cxf/trunk/systests/transports/src/test/java/org/apache/cxf/systest/jms/tx/JMSTransactionClientServerTest.java
(original)
+++
cxf/trunk/systests/transports/src/test/java/org/apache/cxf/systest/jms/tx/JMSTransactionClientServerTest.java
Thu Aug 12 19:53:06 2010
@@ -24,6 +24,7 @@ import java.util.HashMap;
import java.util.Map;
import javax.jms.ConnectionFactory;
+import javax.wsdl.Definition;
import javax.xml.namespace.QName;
import org.apache.cxf.jaxws.JaxWsProxyFactoryBean;
@@ -79,8 +80,8 @@ public class JMSTransactionClientServerT
QName portName = getPortName(new
QName("http://apache.org/hello_world_doc_lit";, "SoapPort2"));
URL wsdl = getWSDLURL("/wsdl/hello_world_doc_lit.wsdl");
assertNotNull(wsdl);
- EmbeddedJMSBrokerLauncher.updateWsdlExtensors(getBus(),
wsdl.toString());
-
+ Definition def =
EmbeddedJMSBrokerLauncher.updateWsdlExtensors(getBus(), wsdl.toString());
+ assertNotNull(def);
SOAPService2 service = new SOAPService2(wsdl, serviceName);
assertNotNull(service);
Modified:
cxf/trunk/systests/transports/src/test/java/org/apache/cxf/systest/multitransport/MultiTransportClientServerTest.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/systests/transports/src/test/java/org/apache/cxf/systest/multitransport/MultiTransportClientServerTest.java?rev=984933&r1=984932&r2=984933&view=diff
==============================================================================
---
cxf/trunk/systests/transports/src/test/java/org/apache/cxf/systest/multitransport/MultiTransportClientServerTest.java
(original)
+++
cxf/trunk/systests/transports/src/test/java/org/apache/cxf/systest/multitransport/MultiTransportClientServerTest.java
Thu Aug 12 19:53:06 2010
@@ -25,6 +25,7 @@ import java.util.HashMap;
import java.util.Map;
import java.util.logging.Logger;
+import javax.wsdl.Definition;
import javax.xml.namespace.QName;
import javax.xml.ws.Endpoint;
@@ -49,12 +50,13 @@ public class MultiTransportClientServerT
"MultiTransportService");
public static class MyServer extends AbstractBusTestServerBase {
-
+ Definition def;
protected void run() {
Object implementor = new HTTPGreeterImpl();
String address = "http://localhost:"; + PORT +
"/SOAPDocLitService/SoapPort";
Endpoint.publish(address, implementor);
- EmbeddedJMSBrokerLauncher.updateWsdlExtensors(getBus(),
"testutils/hello_world_doc_lit.wsdl");
+ def = EmbeddedJMSBrokerLauncher.updateWsdlExtensors(getBus(),
+
"testutils/hello_world_doc_lit.wsdl");
implementor = new JMSGreeterImpl();
Endpoint.publish(null, implementor);
}
@@ -97,7 +99,8 @@ public class MultiTransportClientServerT
QName portName2 = new QName("http://apache.org/hello_world_doc_lit";,
"JMSPort");
URL wsdl = getClass().getResource("/wsdl/hello_world_doc_lit.wsdl");
assertNotNull(wsdl);
- EmbeddedJMSBrokerLauncher.updateWsdlExtensors(getBus(),
wsdl.toString());
+ Definition def =
EmbeddedJMSBrokerLauncher.updateWsdlExtensors(getBus(), wsdl.toString());
+ assertNotNull(def);
MultiTransportService service = new MultiTransportService(wsdl,
serviceName);
assertNotNull(service);
Modified:
cxf/trunk/systests/uncategorized/src/test/java/org/apache/cxf/systest/factory_pattern/MultiplexClientServerTest.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/systests/uncategorized/src/test/java/org/apache/cxf/systest/factory_pattern/MultiplexClientServerTest.java?rev=984933&r1=984932&r2=984933&view=diff
==============================================================================
---
cxf/trunk/systests/uncategorized/src/test/java/org/apache/cxf/systest/factory_pattern/MultiplexClientServerTest.java
(original)
+++
cxf/trunk/systests/uncategorized/src/test/java/org/apache/cxf/systest/factory_pattern/MultiplexClientServerTest.java
Thu Aug 12 19:53:06 2010
@@ -23,6 +23,7 @@ package org.apache.cxf.systest.factory_p
import java.util.HashMap;
import java.util.Map;
+import javax.wsdl.Definition;
import javax.xml.ws.Endpoint;
import javax.xml.ws.wsaddressing.W3CEndpointReference;
@@ -118,8 +119,10 @@ public class MultiplexClientServerTest e
// verify it is JMS, 999 for JMS will throw a fault
W3CEndpointReference ref = factory.create("999");
-
EmbeddedJMSBrokerLauncher.updateWsdlExtensors(BusFactory.getDefaultBus(),
-
NumberService.WSDL_LOCATION.toString());
+ Definition def =
EmbeddedJMSBrokerLauncher.updateWsdlExtensors(BusFactory.getDefaultBus(),
+
NumberService.WSDL_LOCATION
+
.toString());
+ assertNotNull(def);
NumberService numService = new NumberService();
assertNotNull("reference", ref);
Modified:
cxf/trunk/testutils/src/main/java/org/apache/cxf/testutil/common/EmbeddedJMSBrokerLauncher.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/testutils/src/main/java/org/apache/cxf/testutil/common/EmbeddedJMSBrokerLauncher.java?rev=984933&r1=984932&r2=984933&view=diff
==============================================================================
---
cxf/trunk/testutils/src/main/java/org/apache/cxf/testutil/common/EmbeddedJMSBrokerLauncher.java
(original)
+++
cxf/trunk/testutils/src/main/java/org/apache/cxf/testutil/common/EmbeddedJMSBrokerLauncher.java
Thu Aug 12 19:53:06 2010
@@ -41,7 +41,7 @@ public class EmbeddedJMSBrokerLauncher e
final String brokerUrl1 = "tcp://localhost:" + PORT;
- public static void updateWsdlExtensors(Bus bus, String wsdlLocation) {
+ public static Definition updateWsdlExtensors(Bus bus, String wsdlLocation)
{
try {
if (bus == null) {
bus = BusFactory.getThreadDefaultBus();
@@ -87,9 +87,11 @@ public class EmbeddedJMSBrokerLauncher e
}
}
}
+ return def;
} catch (Exception e) {
e.printStackTrace();
}
+ return null;
}
public void tearDown() throws Exception {
