Author: veithen
Date: Sat Sep 6 11:41:50 2008
New Revision: 692705
URL: http://svn.apache.org/viewvc?rev=692705&view=rev
Log:
Transport test kit: fixed some memory leaks
Modified:
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/jms/JMSTestEnvironment.java
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/mail/MailChannel.java
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/client/axis2/AxisTestClient.java
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/client/axis2/AxisTestClientContext.java
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/tests/misc/MinConcurrencyTest.java
Modified:
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/jms/JMSTestEnvironment.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/jms/JMSTestEnvironment.java?rev=692705&r1=692704&r2=692705&view=diff
==============================================================================
---
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/jms/JMSTestEnvironment.java
(original)
+++
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/jms/JMSTestEnvironment.java
Sat Sep 6 11:41:50 2008
@@ -50,6 +50,15 @@
context.bind(TOPIC_CONNECTION_FACTORY, topicConnectionFactory);
}
+ @SuppressWarnings("unused")
+ private void tearDown() throws Exception {
+ context.unbind(QUEUE_CONNECTION_FACTORY);
+ context.unbind(TOPIC_CONNECTION_FACTORY);
+ context = null;
+ queueConnectionFactory = null;
+ topicConnectionFactory = null;
+ }
+
protected abstract QueueConnectionFactory createQueueConnectionFactory()
throws Exception;
protected abstract TopicConnectionFactory createTopicConnectionFactory()
throws Exception;
Modified:
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/mail/MailChannel.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/mail/MailChannel.java?rev=692705&r1=692704&r2=692705&view=diff
==============================================================================
---
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/mail/MailChannel.java
(original)
+++
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/mail/MailChannel.java
Sat Sep 6 11:41:50 2008
@@ -53,6 +53,8 @@
private void tearDown() {
env.freeAccount(sender);
env.freeAccount(recipient);
+ sender = null;
+ recipient = null;
}
public MailTestEnvironment.Account getSender() {
Modified:
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/client/axis2/AxisTestClient.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/client/axis2/AxisTestClient.java?rev=692705&r1=692704&r2=692705&view=diff
==============================================================================
---
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/client/axis2/AxisTestClient.java
(original)
+++
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/client/axis2/AxisTestClient.java
Sat Sep 6 11:41:50 2008
@@ -52,6 +52,13 @@
this.channel = channel;
this.setups = setups;
}
+
+ @SuppressWarnings("unused")
+ private void tearDown() {
+ context = null;
+ channel = null;
+ setups = null;
+ }
public ContentType getContentType(ClientOptions options, ContentType
contentType) {
// TODO: this may be incorrect in some cases
Modified:
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/client/axis2/AxisTestClientContext.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/client/axis2/AxisTestClientContext.java?rev=692705&r1=692704&r2=692705&view=diff
==============================================================================
---
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/client/axis2/AxisTestClientContext.java
(original)
+++
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/client/axis2/AxisTestClientContext.java
Sat Sep 6 11:41:50 2008
@@ -55,6 +55,9 @@
@SuppressWarnings("unused")
private void tearDown() throws Exception {
trpOutDesc.getSender().stop();
+ trpOutDesc = null;
+ cfgCtx.terminate();
+ cfgCtx = null;
}
public ConfigurationContext getConfigurationContext() {
Modified:
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/tests/misc/MinConcurrencyTest.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/tests/misc/MinConcurrencyTest.java?rev=692705&r1=692704&r2=692705&view=diff
==============================================================================
---
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/tests/misc/MinConcurrencyTest.java
(original)
+++
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/tests/misc/MinConcurrencyTest.java
Sat Sep 6 11:41:50 2008
@@ -36,6 +36,7 @@
import org.apache.axis2.engine.MessageReceiver;
import org.apache.synapse.transport.testkit.client.ClientOptions;
import org.apache.synapse.transport.testkit.client.axis2.AxisAsyncTestClient;
+import org.apache.synapse.transport.testkit.client.axis2.AxisTestClientContext;
import org.apache.synapse.transport.testkit.listener.AsyncChannel;
import org.apache.synapse.transport.testkit.message.AxisMessage;
import org.apache.synapse.transport.testkit.name.Name;
@@ -65,6 +66,7 @@
boolean preloadMessages, Object... resources) {
super(resources);
addResource(server);
+ addResource(AxisTestClientContext.INSTANCE);
this.channels = channels;
this.messages = messages;
this.preloadMessages = preloadMessages;
