svn commit: r1544569 - /tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/AnnotationDeployer.java

[rmannibucau]

Author: rmannibucau
Date: Fri Nov 22 15:19:24 2013
New Revision: 1544569

URL: http://svn.apache.org/r1544569
Log:
TOMEE-1086 seems tests were not don in the right order for @WebServiceRef.value

Modified:
    
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/AnnotationDeployer.java

Modified: 
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/AnnotationDeployer.java
URL: 
http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/AnnotationDeployer.java?rev=1544569&r1=1544568&r2=1544569&view=diff
==============================================================================
--- 
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/AnnotationDeployer.java
 (original)
+++ 
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/AnnotationDeployer.java
 Fri Nov 22 15:19:24 2013
@@ -4539,14 +4539,13 @@ public class AnnotationDeployer implemen
             if (serviceRef.getServiceInterface() == null) {
                 serviceInterface = webService.type();
                 if (serviceInterface.equals(Object.class)) {
-                    if (member != null) {
+                    serviceInterface = webService.value();
+                    if ((Service.class.equals(serviceInterface) || 
Object.class.equals(serviceInterface)) && member != null) {
                         serviceInterface = member.getType();
-                    } else {
-                        serviceInterface = webService.value();
                     }
                 }
             }
-            if (serviceInterface == null || 
!serviceInterface.isAssignableFrom(Service.class)) {
+            if (serviceInterface == null || 
!Service.class.isAssignableFrom(serviceInterface)) {
                 serviceInterface = Service.class;
             }
             serviceRef.setServiceInterface(serviceInterface.getName());