[jboss-svn-commits] JBL Code SVN: r15604 - in labs/jbossesb/trunk/product/tools/console: management/src/main/java/org/jboss/soa/esb/monitoring/server and 1 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Fri Oct 5 12:27:34 EDT 2007
Author: tcunning
Date: 2007-10-05 12:27:34 -0400 (Fri, 05 Oct 2007)
New Revision: 15604
Modified:
labs/jbossesb/trunk/product/tools/console/management-web/src/main/webapp/collect.jsp
labs/jbossesb/trunk/product/tools/console/management-web/src/main/webapp/collectcommands.jsp
labs/jbossesb/trunk/product/tools/console/management-web/src/main/webapp/invoke.jsp
labs/jbossesb/trunk/product/tools/console/management-web/src/main/webapp/manage.jsp
labs/jbossesb/trunk/product/tools/console/management/src/main/java/org/jboss/soa/esb/monitoring/client/DataCollectorAction.java
labs/jbossesb/trunk/product/tools/console/management/src/main/java/org/jboss/soa/esb/monitoring/client/InvokerAction.java
labs/jbossesb/trunk/product/tools/console/management/src/main/java/org/jboss/soa/esb/monitoring/client/OperationsCollectorAction.java
labs/jbossesb/trunk/product/tools/console/management/src/main/java/org/jboss/soa/esb/monitoring/server/DataFilerJob.java
Log:
bug:JBESB-1119
Fix leaks by cleaning courier in finally.
Modified: labs/jbossesb/trunk/product/tools/console/management/src/main/java/org/jboss/soa/esb/monitoring/client/DataCollectorAction.java
===================================================================
--- labs/jbossesb/trunk/product/tools/console/management/src/main/java/org/jboss/soa/esb/monitoring/client/DataCollectorAction.java 2007-10-05 15:49:27 UTC (rev 15603)
+++ labs/jbossesb/trunk/product/tools/console/management/src/main/java/org/jboss/soa/esb/monitoring/client/DataCollectorAction.java 2007-10-05 16:27:34 UTC (rev 15604)
@@ -33,6 +33,7 @@
import org.jboss.soa.esb.addressing.Call;
import org.jboss.soa.esb.addressing.EPR;
import org.jboss.soa.esb.couriers.CourierFactory;
+import org.jboss.soa.esb.couriers.CourierUtil;
import org.jboss.soa.esb.helpers.ConfigTree;
import org.jboss.soa.esb.listeners.RegistryUtil;
import org.jboss.soa.esb.message.Message;
@@ -83,10 +84,14 @@
DeliverOnlyCourier sender = null;
try {
- sender = CourierFactory.getCourier(epr);
URI uri = new URI(UUID.randomUUID().toString());
esbMessage.getHeader().getCall().setMessageID(uri);
- sender.deliver(esbMessage);
+ try {
+ sender = CourierFactory.getCourier(epr);
+ sender.deliver(esbMessage);
+ } finally {
+ CourierUtil.cleanCourier(sender);
+ }
} catch (Exception e) {
logger.error("", e);
} finally {
Modified: labs/jbossesb/trunk/product/tools/console/management/src/main/java/org/jboss/soa/esb/monitoring/client/InvokerAction.java
===================================================================
--- labs/jbossesb/trunk/product/tools/console/management/src/main/java/org/jboss/soa/esb/monitoring/client/InvokerAction.java 2007-10-05 15:49:27 UTC (rev 15603)
+++ labs/jbossesb/trunk/product/tools/console/management/src/main/java/org/jboss/soa/esb/monitoring/client/InvokerAction.java 2007-10-05 16:27:34 UTC (rev 15604)
@@ -33,6 +33,7 @@
import org.jboss.soa.esb.addressing.Call;
import org.jboss.soa.esb.addressing.EPR;
import org.jboss.soa.esb.couriers.CourierFactory;
+import org.jboss.soa.esb.couriers.CourierUtil;
import org.jboss.soa.esb.helpers.ConfigTree;
import org.jboss.soa.esb.listeners.RegistryUtil;
import org.jboss.soa.esb.message.Message;
@@ -95,15 +96,17 @@
DeliverOnlyCourier sender = null;
try {
- sender = CourierFactory.getCourier(epr);
URI uri = new URI(UUID.randomUUID().toString());
esbMessage.getHeader().getCall().setMessageID(uri);
- sender.deliver(esbMessage);
+ try {
+ sender = CourierFactory.getCourier(epr);
+ sender.deliver(esbMessage);
+ } finally {
+ CourierUtil.cleanCourier(sender);
+ }
} catch (Exception e) {
logger.error("", e);
- } finally {
- sender.cleanup();
- }
+ }
}
} else {
logger.error("DataCollectorAction received a message which was not a command message");
Modified: labs/jbossesb/trunk/product/tools/console/management/src/main/java/org/jboss/soa/esb/monitoring/client/OperationsCollectorAction.java
===================================================================
--- labs/jbossesb/trunk/product/tools/console/management/src/main/java/org/jboss/soa/esb/monitoring/client/OperationsCollectorAction.java 2007-10-05 15:49:27 UTC (rev 15603)
+++ labs/jbossesb/trunk/product/tools/console/management/src/main/java/org/jboss/soa/esb/monitoring/client/OperationsCollectorAction.java 2007-10-05 16:27:34 UTC (rev 15604)
@@ -33,6 +33,7 @@
import org.jboss.soa.esb.addressing.Call;
import org.jboss.soa.esb.addressing.EPR;
import org.jboss.soa.esb.couriers.CourierFactory;
+import org.jboss.soa.esb.couriers.CourierUtil;
import org.jboss.soa.esb.helpers.ConfigTree;
import org.jboss.soa.esb.listeners.RegistryUtil;
import org.jboss.soa.esb.message.Message;
@@ -84,14 +85,16 @@
DeliverOnlyCourier sender = null;
try {
- sender = CourierFactory.getCourier(epr);
URI uri = new URI(UUID.randomUUID().toString());
esbMessage.getHeader().getCall().setMessageID(uri);
- sender.deliver(esbMessage);
+ try {
+ sender = CourierFactory.getCourier(epr);
+ sender.deliver(esbMessage);
+ } finally {
+ CourierUtil.cleanCourier(sender);
+ }
} catch (Exception e) {
logger.error("", e);
- } finally {
- sender.cleanup();
}
}
} else {
Modified: labs/jbossesb/trunk/product/tools/console/management/src/main/java/org/jboss/soa/esb/monitoring/server/DataFilerJob.java
===================================================================
--- labs/jbossesb/trunk/product/tools/console/management/src/main/java/org/jboss/soa/esb/monitoring/server/DataFilerJob.java 2007-10-05 15:49:27 UTC (rev 15603)
+++ labs/jbossesb/trunk/product/tools/console/management/src/main/java/org/jboss/soa/esb/monitoring/server/DataFilerJob.java 2007-10-05 16:27:34 UTC (rev 15604)
@@ -32,6 +32,7 @@
import org.jboss.soa.esb.addressing.MalformedEPRException;
import org.jboss.soa.esb.couriers.CourierException;
import org.jboss.soa.esb.couriers.CourierFactory;
+import org.jboss.soa.esb.couriers.CourierUtil;
import org.jboss.soa.esb.listeners.RegistryUtil;
import org.jboss.soa.esb.message.Message;
import org.jboss.soa.esb.message.body.content.BytesBody;
@@ -68,13 +69,18 @@
EPR epr = (EPR)list.get(i);
// Send message requesting performance data
Message esbMessage = MessageFactory.getInstance().getMessage();
- sender = CourierFactory.getCourier(epr);
esbMessage.getProperties().setProperty(MessageBodyTypeNames.COMMAND_TYPE, MessageBodyTypeNames.STATISTICS_REQUEST);
esbMessage.getBody().add(BytesBody.BYTES_LOCATION, "get statistics".getBytes());
URI uri = new URI(UUID.randomUUID().toString());
esbMessage.getHeader().getCall().setMessageID(uri);
- sender.deliver(esbMessage);
+
+ try {
+ sender = CourierFactory.getCourier(epr);
+ sender.deliver(esbMessage);
+ } finally {
+ CourierUtil.cleanCourier(sender);
+ }
}
}
@@ -84,13 +90,17 @@
EPR epr = (EPR)list.get(i);
// Send message requesting operations data
Message opMessage = MessageFactory.getInstance().getMessage();
- sender = CourierFactory.getCourier(epr);
opMessage.getProperties().setProperty(MessageBodyTypeNames.COMMAND_TYPE, MessageBodyTypeNames.OPERATIONS_REQUEST);
opMessage.getBody().add(BytesBody.BYTES_LOCATION, "get statistics".getBytes());
URI opURI = new URI(UUID.randomUUID().toString());
opMessage.getHeader().getCall().setMessageID(opURI);
- sender.deliver(opMessage);
+ try{
+ sender = CourierFactory.getCourier(epr);
+ sender.deliver(opMessage);
+ } finally {
+ CourierUtil.cleanCourier(sender);
+ }
}
}
} catch (RegistryException e) {
@@ -103,10 +113,6 @@
logger.error("", e);
} catch (ServiceNotFoundException e) {
logger.error("", e);
- } finally {
- if (sender != null) {
- sender.cleanup();
- }
- }
+ }
}
}
Modified: labs/jbossesb/trunk/product/tools/console/management-web/src/main/webapp/collect.jsp
===================================================================
--- labs/jbossesb/trunk/product/tools/console/management-web/src/main/webapp/collect.jsp 2007-10-05 15:49:27 UTC (rev 15603)
+++ labs/jbossesb/trunk/product/tools/console/management-web/src/main/webapp/collect.jsp 2007-10-05 16:27:34 UTC (rev 15604)
@@ -4,6 +4,7 @@
<%@ page import="
org.jboss.soa.esb.addressing.EPR,
org.jboss.soa.esb.couriers.CourierFactory,
+ org.jboss.soa.esb.couriers.CourierUtil,
org.jboss.internal.soa.esb.couriers.DeliverOnlyCourier,
org.jboss.soa.esb.listeners.RegistryUtil,
org.jboss.soa.esb.message.Message,
@@ -19,15 +20,20 @@
for (int i = 0; i < list.size(); i++) {
EPR epr = (EPR)list.get(i);
Message esbMessage = MessageFactory.getInstance().getMessage();
- DeliverOnlyCourier sender = CourierFactory.getCourier(epr);
esbMessage.getProperties().setProperty(MessageBodyTypeNames.COMMAND_TYPE, MessageBodyTypeNames.STATISTICS_REQUEST);
esbMessage.getBody().add(BytesBody.BYTES_LOCATION, MessageBodyTypeNames.STATISTICS_REQUEST.getBytes());
URI uri = new URI(UUID.randomUUID().toString());
esbMessage.getHeader().getCall().setMessageID(uri);
- sender.deliver(esbMessage);
-
+
+ DeliverOnlyCourier sender = null;
+ try {
+ sender = CourierFactory.getCourier(epr);
+ sender.deliver(esbMessage);
+ } finally {
+ CourierUtil.cleanCourier(sender);
+ }
}
}
Modified: labs/jbossesb/trunk/product/tools/console/management-web/src/main/webapp/collectcommands.jsp
===================================================================
--- labs/jbossesb/trunk/product/tools/console/management-web/src/main/webapp/collectcommands.jsp 2007-10-05 15:49:27 UTC (rev 15603)
+++ labs/jbossesb/trunk/product/tools/console/management-web/src/main/webapp/collectcommands.jsp 2007-10-05 16:27:34 UTC (rev 15604)
@@ -4,6 +4,7 @@
<%@ page import="
org.jboss.soa.esb.addressing.EPR,
org.jboss.soa.esb.couriers.CourierFactory,
+ org.jboss.soa.esb.couriers.CourierUtil,
org.jboss.internal.soa.esb.couriers.DeliverOnlyCourier,
org.jboss.soa.esb.listeners.RegistryUtil,
org.jboss.soa.esb.message.Message,
@@ -19,15 +20,21 @@
for (int i = 0; i < list.size(); i++) {
EPR epr = (EPR)list.get(i);
Message esbMessage = MessageFactory.getInstance().getMessage();
- DeliverOnlyCourier sender = CourierFactory.getCourier(epr);
esbMessage.getProperties().setProperty(MessageBodyTypeNames.COMMAND_TYPE, MessageBodyTypeNames.STATISTICS_REQUEST);
esbMessage.getBody().add(BytesBody.BYTES_LOCATION, MessageBodyTypeNames.STATISTICS_REQUEST.getBytes());
URI uri = new URI(UUID.randomUUID().toString());
esbMessage.getHeader().getCall().setMessageID(uri);
- sender.deliver(esbMessage);
-
+
+ DeliverOnlyCourier sender = null;
+
+ try {
+ sender =CourierFactory.getCourier(epr);
+ sender.deliver(esbMessage);
+ } finally {
+ CourierUtil.cleanCourier(sender);
+ }
}
}
Modified: labs/jbossesb/trunk/product/tools/console/management-web/src/main/webapp/invoke.jsp
===================================================================
--- labs/jbossesb/trunk/product/tools/console/management-web/src/main/webapp/invoke.jsp 2007-10-05 15:49:27 UTC (rev 15603)
+++ labs/jbossesb/trunk/product/tools/console/management-web/src/main/webapp/invoke.jsp 2007-10-05 16:27:34 UTC (rev 15604)
@@ -3,6 +3,7 @@
<%@ page import="
org.jboss.soa.esb.addressing.EPR,
org.jboss.soa.esb.couriers.CourierFactory,
+ org.jboss.soa.esb.couriers.CourierUtil,
org.jboss.internal.soa.esb.couriers.DeliverOnlyCourier,
org.jboss.soa.esb.listeners.RegistryUtil,
org.jboss.soa.esb.message.Message,
@@ -74,14 +75,19 @@
for (int i = 0; i < list.size(); i++) {
EPR epr = (EPR)list.get(i);
Message esbMessage = MessageFactory.getInstance().getMessage();
- DeliverOnlyCourier sender = CourierFactory.getCourier(epr);
esbMessage.getProperties().setProperty(MessageBodyTypeNames.COMMAND_TYPE, MessageBodyTypeNames.INVOKER_REQUEST);
esbMessage.getBody().add(obean);
URI uri = new URI(UUID.randomUUID().toString());
esbMessage.getHeader().getCall().setMessageID(uri);
- sender.deliver(esbMessage);
-
+
+ DeliverOnlyCourier sender = null;
+ try {
+ sender = CourierFactory.getCourier(epr);
+ sender.deliver(esbMessage);
+ } finally {
+ CourierUtil.cleanCourier(sender);
+ }
}
}
Modified: labs/jbossesb/trunk/product/tools/console/management-web/src/main/webapp/manage.jsp
===================================================================
--- labs/jbossesb/trunk/product/tools/console/management-web/src/main/webapp/manage.jsp 2007-10-05 15:49:27 UTC (rev 15603)
+++ labs/jbossesb/trunk/product/tools/console/management-web/src/main/webapp/manage.jsp 2007-10-05 16:27:34 UTC (rev 15604)
@@ -4,6 +4,7 @@
<%@ page import="
org.jboss.soa.esb.addressing.EPR,
org.jboss.soa.esb.couriers.CourierFactory,
+ org.jboss.soa.esb.couriers.CourierUtil,
org.jboss.internal.soa.esb.couriers.DeliverOnlyCourier,
org.jboss.soa.esb.listeners.RegistryUtil,
org.jboss.soa.esb.message.Message,
@@ -20,14 +21,20 @@
for (int i = 0; i < list.size(); i++) {
EPR epr = (EPR)list.get(i);
Message esbMessage = MessageFactory.getInstance().getMessage();
- DeliverOnlyCourier sender = CourierFactory.getCourier(epr);
esbMessage.getProperties().setProperty(MessageBodyTypeNames.COMMAND_TYPE, MessageBodyTypeNames.OPERATIONS_REQUEST);
esbMessage.getBody().add(BytesBody.BYTES_LOCATION, MessageBodyTypeNames.OPERATIONS_REQUEST.getBytes());
URI uri = new URI(UUID.randomUUID().toString());
esbMessage.getHeader().getCall().setMessageID(uri);
- sender.deliver(esbMessage);
+
+ DeliverOnlyCourier sender = null;
+ try {
+ sender = CourierFactory.getCourier(epr);
+ sender.deliver(esbMessage);
+ } finally {
+ CourierUtil.cleanCourier(sender);
+ }
}
}
More information about the jboss-svn-commits
mailing list