servicemix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gno...@apache.org
Subject svn commit: r393328 - in /incubator/servicemix/trunk/servicemix-core/src: main/java/org/apache/servicemix/jbi/container/ test/java/org/apache/servicemix/jbi/nmr/
Date Tue, 11 Apr 2006 23:07:39 GMT
Author: gnodet
Date: Tue Apr 11 16:07:37 2006
New Revision: 393328

URL: http://svn.apache.org/viewcvs?rev=393328&view=rev
Log:
ActivationSpec should not override the endpoint defined in component if no service is defined
on the activation spec

Modified:
    incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/jbi/container/JBIContainer.java
    incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/jbi/nmr/SubscriptionPropertyCopyTest.java
    incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/jbi/nmr/SubscriptionTest.java

Modified: incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/jbi/container/JBIContainer.java
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/jbi/container/JBIContainer.java?rev=393328&r1=393327&r2=393328&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/jbi/container/JBIContainer.java
(original)
+++ incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/jbi/container/JBIContainer.java
Tue Apr 11 16:07:37 2006
@@ -845,7 +845,7 @@
         if (id == null) {
             throw new IllegalArgumentException("A Registration must have an ID");
         }
-        if (activationSpec.getEndpoint() == null) {
+        if (activationSpec.getEndpoint() == null && activationSpec.getService() !=
null) {
             // lets default to the ID
             activationSpec.setEndpoint(id);
         }

Modified: incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/jbi/nmr/SubscriptionPropertyCopyTest.java
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/jbi/nmr/SubscriptionPropertyCopyTest.java?rev=393328&r1=393327&r2=393328&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/jbi/nmr/SubscriptionPropertyCopyTest.java
(original)
+++ incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/jbi/nmr/SubscriptionPropertyCopyTest.java
Tue Apr 11 16:07:37 2006
@@ -102,6 +102,7 @@
 		ActivationSpec as = new ActivationSpec(id, component);
 		SubscriptionSpec ss = new SubscriptionSpec();
 		ss.setService(SenderComponent.SERVICE);
+        as.setEndpoint(id);
 		as.setSubscriptions(new SubscriptionSpec[] { ss }); 
 		return as;
 	}

Modified: incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/jbi/nmr/SubscriptionTest.java
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/jbi/nmr/SubscriptionTest.java?rev=393328&r1=393327&r2=393328&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/jbi/nmr/SubscriptionTest.java
(original)
+++ incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/jbi/nmr/SubscriptionTest.java
Tue Apr 11 16:07:37 2006
@@ -130,6 +130,7 @@
 		ActivationSpec as = new ActivationSpec(id, component);
 		SubscriptionSpec ss = new SubscriptionSpec();
 		ss.setService(SenderComponent.SERVICE);
+        as.setEndpoint(id);
 		as.setSubscriptions(new SubscriptionSpec[] { ss }); 
 		return as;
 	}



Mime
View raw message