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

[rmannibucau]

Author: rmannibucau
Date: Mon Jul  8 07:34:20 2013
New Revision: 1500595

URL: http://svn.apache.org/r1500595
Log:
TOMEE-993 WS SEI as @Remote with a flag - keep @Local if it was already here

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=1500595&r1=1500594&r2=1500595&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
 Mon Jul  8 07:34:20 2013
@@ -2937,11 +2937,6 @@ public class AnnotationDeployer implemen
                 BusinessInterfaces bean = new BusinessInterfaces();
                 if (local != null) bean.local.addAll(asList(local.value()));
                 if (remote != null) bean.remote.addAll(asList(remote.value()));
-                if (webserviceAsRemote
-                        && webServiceItf != null
-                        && bean.remote.isEmpty()) {
-                    bean.remote.add(webServiceItf);
-                }
 
                 if (strict) for (Class interfce : bean.local) {
                     if (bean.remote.contains(interfce)) {
@@ -3132,6 +3127,13 @@ public class AnnotationDeployer implemen
                     }
                 }
 
+                // do it here to not loose the @Local handling (if 
(interfaces.size() == 1))
+                if (webserviceAsRemote
+                        && webServiceItf != null
+                        && all.remote.isEmpty()) {
+                    all.remote.add(webServiceItf);
+                }
+
                 //alway set Local View for ManagedBean
                 if (beanClass.isAnnotationPresent(ManagedBean.class)){
                     sessionBean.setLocalBean(new Empty());