Title: [932] trunk/servicemix-common/src/main/java/org/servicemix/common: Check than an endpoint (service name + endpoint name) is unique.
- Revision
- 932
- Author
- gnt
- Date
- 2005-11-25 04:16:52 -0500 (Fri, 25 Nov 2005)
Log Message
Check than an endpoint (service name + endpoint name) is unique.
When the polling thread stops, do not log the exception
Endpoint now reuses the component's logger.
Modified Paths
Diff
Modified: trunk/servicemix-common/src/main/java/org/servicemix/common/BaseLifeCycle.java (931 => 932)
--- trunk/servicemix-common/src/main/java/org/servicemix/common/BaseLifeCycle.java 2005-11-25 08:59:36 UTC (rev 931)
+++ trunk/servicemix-common/src/main/java/org/servicemix/common/BaseLifeCycle.java 2005-11-25 09:16:52 UTC (rev 932)
@@ -259,7 +259,7 @@
if (running.get() == false) {
// Should have been interrupted, discard the throwable
if (logger.isDebugEnabled()) {
- logger.debug("Polling thread will stop", t);
+ logger.debug("Polling thread will stop");
}
} else {
logger.error("Error polling delivery channel", t);
Modified: trunk/servicemix-common/src/main/java/org/servicemix/common/Endpoint.java (931 => 932)
--- trunk/servicemix-common/src/main/java/org/servicemix/common/Endpoint.java 2005-11-25 08:59:36 UTC (rev 931)
+++ trunk/servicemix-common/src/main/java/org/servicemix/common/Endpoint.java 2005-11-25 09:16:52 UTC (rev 932)
@@ -17,6 +17,7 @@
**/
package org.servicemix.common;
+import org.apache.commons.logging.Log;
import org.w3c.dom.Document;
import javax.jbi.messaging.MessageExchange;
@@ -30,6 +31,7 @@
protected QName interfaceName;
protected Document description;
protected ServiceUnit serviceUnit;
+ protected Log logger;
public Endpoint() {
}
@@ -104,6 +106,7 @@
*/
public void setServiceUnit(ServiceUnit serviceUnit) {
this.serviceUnit = serviceUnit;
+ this.logger = serviceUnit.component.logger;
}
public boolean isExchangeOkay(MessageExchange exchange) {
Modified: trunk/servicemix-common/src/main/java/org/servicemix/common/xbean/AbstractXBeanDeployer.java (931 => 932)
--- trunk/servicemix-common/src/main/java/org/servicemix/common/xbean/AbstractXBeanDeployer.java 2005-11-25 08:59:36 UTC (rev 931)
+++ trunk/servicemix-common/src/main/java/org/servicemix/common/xbean/AbstractXBeanDeployer.java 2005-11-25 09:16:52 UTC (rev 932)
@@ -20,6 +20,7 @@
import org.servicemix.common.AbstractDeployer;
import org.servicemix.common.BaseComponent;
import org.servicemix.common.Endpoint;
+import org.servicemix.common.EndpointSupport;
import org.servicemix.common.ServiceUnit;
import org.xbean.kernel.Kernel;
import org.xbean.kernel.KernelFactory;
@@ -85,6 +86,9 @@
Endpoint endpoint = (Endpoint) iter.next();
endpoint.setServiceUnit(su);
if (validate(endpoint)) {
+ if (su.getEndpoint(EndpointSupport.getKey(endpoint)) != null) {
+ throw failure("deploy", "More than one endpoint found for: " + EndpointSupport.getKey(endpoint), null);
+ }
su.addEndpoint(endpoint);
} else {
logger.warn("Endpoint " + endpoint + "has not been validated");
