You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by rf...@apache.org on 2007/09/13 20:54:16 UTC

svn commit: r575401 - in /incubator/tuscany/java/sca/modules/implementation-java/src: main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/

Author: rfeng
Date: Thu Sep 13 11:54:15 2007
New Revision: 575401

URL: http://svn.apache.org/viewvc?rev=575401&view=rev
Log:
Apply the patch for TUSCANY-1629. Thank you, Mark.

Modified:
    incubator/tuscany/java/sca/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ServiceProcessor.java
    incubator/tuscany/java/sca/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ServiceProcessorTestCase.java

Modified: incubator/tuscany/java/sca/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ServiceProcessor.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ServiceProcessor.java?rev=575401&r1=575400&r2=575401&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ServiceProcessor.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ServiceProcessor.java Thu Sep 13 11:54:15 2007
@@ -83,16 +83,12 @@
             }
         }
         for (Class<?> interfaze : interfaces) {
-            if (!interfaze.isInterface()) {
-                throw new InvalidServiceType("Service must be an interface", interfaze);
-            }
-            Service service;
             try {
-                service = createService(interfaze);
+                Service service = createService(interfaze);
+                type.getServices().add(service);
             } catch (InvalidInterfaceException e) {
                 throw new IntrospectionException(e);
             }
-            type.getServices().add(service);
         }
     }
 

Modified: incubator/tuscany/java/sca/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ServiceProcessorTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ServiceProcessorTestCase.java?rev=575401&r1=575400&r2=575401&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ServiceProcessorTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ServiceProcessorTestCase.java Thu Sep 13 11:54:15 2007
@@ -73,12 +73,7 @@
     }
 
     public void testNonInterface() throws Exception {
-        try {
-            processor.visitClass(BadImpl.class, type);
-            fail();
-        } catch (InvalidServiceType e) {
-            //expected
-        }
+        processor.visitClass(FooServiceUsingClassImpl.class, type);
     }
 
     public void testNoInterfaces() throws Exception {
@@ -135,7 +130,7 @@
     }
 
     @Service(FooSingle.class)
-    private class BadImpl extends FooSingle {
+    private class FooServiceUsingClassImpl extends FooSingle {
 
     }
 



---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org