Author: lresende
Date: Thu Apr 29 04:49:29 2010
New Revision: 939191
URL: http://svn.apache.org/viewvc?rev=939191&view=rev
Log:
TUSCANY-3543 - Return first available binding when creating selfReference with
multiple bindings and no default one specified
Modified:
tuscany/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/context/impl/ComponentContextImpl.java
Modified:
tuscany/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/context/impl/ComponentContextImpl.java
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/context/impl/ComponentContextImpl.java?rev=939191&r1=939190&r2=939191&view=diff
==============================================================================
---
tuscany/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/context/impl/ComponentContextImpl.java
(original)
+++
tuscany/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/context/impl/ComponentContextImpl.java
Thu Apr 29 04:49:29 2010
@@ -159,14 +159,21 @@ public class ComponentContextImpl implem
// The default binding name is the name of the promoted service
bindingName = getPromotedService(service).getName();
}
+ Endpoint returnEp = null;
List<Endpoint> eps = service.getEndpoints();
for (Endpoint ep : eps) {
Binding binding = ep.getBinding();
if (bindingName.equals(binding.getName()) || binding.getName() ==
null) {
- return ep;
+ returnEp = ep;
+ break;
}
}
- return null;
+ //TUSCANY-3543
+ if(returnEp == null) {
+ returnEp = eps.get(0);
+ }
+
+ return returnEp;
}
private ComponentService getPromotedService(ComponentService
componentService) {
