You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by js...@apache.org on 2007/05/05 12:56:34 UTC
svn commit: r535504 -
/incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/assembly/builder/impl/DefaultCompositeBuilder.java
Author: jsdelfino
Date: Sat May 5 03:56:33 2007
New Revision: 535504
URL: http://svn.apache.org/viewvc?view=rev&rev=535504
Log:
One more file missed in the previous commit.
Modified:
incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/assembly/builder/impl/DefaultCompositeBuilder.java
Modified: incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/assembly/builder/impl/DefaultCompositeBuilder.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/assembly/builder/impl/DefaultCompositeBuilder.java?view=diff&rev=535504&r1=535503&r2=535504
==============================================================================
--- incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/assembly/builder/impl/DefaultCompositeBuilder.java (original)
+++ incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/assembly/builder/impl/DefaultCompositeBuilder.java Sat May 5 03:56:33 2007
@@ -615,17 +615,17 @@
CompositeService compositeService = (CompositeService)service;
ComponentService componentService = compositeService.getPromotedService();
if (componentService != null && componentService.isUnresolved()) {
- componentService = componentServices.get(componentService.getName());
- if (componentService != null) {
+ ComponentService promotedService = componentServices.get(componentService.getName());
+ if (promotedService != null) {
// Point to the resolved component service
- compositeService.setPromotedService(componentService);
- componentService.promotedAs().add(compositeService);
+ compositeService.setPromotedService(promotedService);
+ promotedService.promotedAs().add(compositeService);
// Use the interface contract from the component service if
// none is specified on the composite service
if (compositeService.getInterfaceContract() == null) {
- compositeService.setInterfaceContract(componentService.getInterfaceContract());
+ compositeService.setInterfaceContract(promotedService.getInterfaceContract());
}
} else {
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org