svn commit: r641881 - in /incubator/tuscany/branches/sca-java-1.2: itest/references/src/test/java/org/apache/tuscany/sca/itest/references/ modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/

[rfeng]

Author: rfeng
Date: Thu Mar 27 09:46:04 2008
New Revision: 641881

URL: http://svn.apache.org/viewvc?rev=641881&view=rev
Log:
Fix for TUSCANY-2136 (merged from trunk)

Modified:
    
incubator/tuscany/branches/sca-java-1.2/itest/references/src/test/java/org/apache/tuscany/sca/itest/references/AutoWiredReferenceTestCase.java
    
incubator/tuscany/branches/sca-java-1.2/itest/references/src/test/java/org/apache/tuscany/sca/itest/references/InnerReferenceTestCase.java
    
incubator/tuscany/branches/sca-java-1.2/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/CompositeActivatorImpl.java

Modified: 
incubator/tuscany/branches/sca-java-1.2/itest/references/src/test/java/org/apache/tuscany/sca/itest/references/AutoWiredReferenceTestCase.java
URL: 
http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.2/itest/references/src/test/java/org/apache/tuscany/sca/itest/references/AutoWiredReferenceTestCase.java?rev=641881&r1=641880&r2=641881&view=diff
==============================================================================
--- 
incubator/tuscany/branches/sca-java-1.2/itest/references/src/test/java/org/apache/tuscany/sca/itest/references/AutoWiredReferenceTestCase.java
 (original)
+++ 
incubator/tuscany/branches/sca-java-1.2/itest/references/src/test/java/org/apache/tuscany/sca/itest/references/AutoWiredReferenceTestCase.java
 Thu Mar 27 09:46:04 2008
@@ -25,7 +25,6 @@
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
-import org.osoa.sca.ServiceUnavailableException;
 
 public class AutoWiredReferenceTestCase {
     private static SCADomain domain;
@@ -57,7 +56,7 @@
         assertEquals("BCComponent", acomponent.fooBC());
     }
 
-    @Test(expected = ServiceUnavailableException.class)
+    @Test(expected = NullPointerException.class)
     public void testD1Reference() {
         acomponent.fooD1();
     }

Modified: 
incubator/tuscany/branches/sca-java-1.2/itest/references/src/test/java/org/apache/tuscany/sca/itest/references/InnerReferenceTestCase.java
URL: 
http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.2/itest/references/src/test/java/org/apache/tuscany/sca/itest/references/InnerReferenceTestCase.java?rev=641881&r1=641880&r2=641881&view=diff
==============================================================================
--- 
incubator/tuscany/branches/sca-java-1.2/itest/references/src/test/java/org/apache/tuscany/sca/itest/references/InnerReferenceTestCase.java
 (original)
+++ 
incubator/tuscany/branches/sca-java-1.2/itest/references/src/test/java/org/apache/tuscany/sca/itest/references/InnerReferenceTestCase.java
 Thu Mar 27 09:46:04 2008
@@ -86,13 +86,9 @@
         Assert.assertTrue(components.contains("DComponent1"));
     }    
 
-    @Test
+    @Test(expected = NullPointerException.class)
     public void testRequiredFalseReference() {
-        try {
-            acomponent.getDReference().dFoo();
-        } catch (Exception e) {
-            Assert.assertTrue(true);
-        }
+        acomponent.getDReference().dFoo();
     }
 
 }

Modified: 
incubator/tuscany/branches/sca-java-1.2/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/CompositeActivatorImpl.java
URL: 
http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.2/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/CompositeActivatorImpl.java?rev=641881&r1=641880&r2=641881&view=diff
==============================================================================
--- 
incubator/tuscany/branches/sca-java-1.2/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/CompositeActivatorImpl.java
 (original)
+++ 
incubator/tuscany/branches/sca-java-1.2/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/CompositeActivatorImpl.java
 Thu Mar 27 09:46:04 2008
@@ -281,6 +281,10 @@
             targetComponent = endpoint.getTargetComponent();
             targetComponentService = endpoint.getTargetComponentService();
             targetBinding = endpoint.getTargetBinding();
+            // FIXME: TUSCANY-2136, For unresolved binding, don't add wire. Is 
it the right solution?
+            if (!reference.isCallback() && binding.getURI() == null && 
targetComponentService == null) {
+                return;
+            }
         }
 
         // create a forward wire, either static or dynamic



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]