svn commit: r1209441 - /tuscany/sca-java-2.x/trunk/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/ComponentPolicyBuilderImpl.java

[antelder]

Author: antelder
Date: Fri Dec  2 12:29:30 2011
New Revision: 1209441

URL: http://svn.apache.org/viewvc?rev=1209441&view=rev
Log:
TUSCANY-3974: Apply patch from Greg Dritschler to fix IntentNotSatisfiedAtBuild 
error occurs when using an intent provided by implementation

Modified:
    
tuscany/sca-java-2.x/trunk/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/ComponentPolicyBuilderImpl.java

Modified: 
tuscany/sca-java-2.x/trunk/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/ComponentPolicyBuilderImpl.java
URL: 
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/ComponentPolicyBuilderImpl.java?rev=1209441&r1=1209440&r2=1209441&view=diff
==============================================================================
--- 
tuscany/sca-java-2.x/trunk/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/ComponentPolicyBuilderImpl.java
 (original)
+++ 
tuscany/sca-java-2.x/trunk/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/ComponentPolicyBuilderImpl.java
 Fri Dec  2 12:29:30 2011
@@ -554,9 +554,17 @@ public class ComponentPolicyBuilderImpl 
                        } else {
                                // The ExtensionType on the subject only has 
the binding name. The one in the system
                                // definitions will have the 
mayProvide/alwaysProvides values
-                               for ( ExtensionType et : 
context.getDefinitions().getBindingTypes() ) {
-                                       if ( 
type.getType().equals(et.getType()) ) {
-                                               type = et;
+                               if 
(type.getType().getLocalPart().startsWith("implementation")) {
+                                   for ( ExtensionType et : 
context.getDefinitions().getImplementationTypes() ) {
+                                           if ( 
type.getType().equals(et.getType()) ) {
+                                                   type = et;
+                                           }
+                                       }
+                               } else {
+                                   for ( ExtensionType et : 
context.getDefinitions().getBindingTypes() ) {
+                                           if ( 
type.getType().equals(et.getType()) ) {
+                                                   type = et;
+                                           }
                                        }
                                }