svn commit: r541860 - in /incubator/cxf/trunk/rt/frontend: jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceConfiguration.java simple/src/main/java/org/apache/cxf/service/factory/ReflectionServiceFactoryBean.java

[gawor]

Author: gawor
Date: Fri May 25 22:25:28 2007
New Revision: 541860

URL: http://svn.apache.org/viewvc?view=rev&rev=541860
Log:
a better check if wrapped overwrite was set

Modified:
    
incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceConfiguration.java
    
incubator/cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/ReflectionServiceFactoryBean.java

Modified: 
incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceConfiguration.java
URL: 
http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceConfiguration.java?view=diff&rev=541860&r1=541859&r2=541860
==============================================================================
--- 
incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceConfiguration.java
 (original)
+++ 
incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceConfiguration.java
 Fri May 25 22:25:28 2007
@@ -526,8 +526,8 @@
     @Override
     public Boolean isWrapped(Method m) {
         // see if someone overrode the default value
-        if (!getServiceFactory().isWrapped()) {
-            return Boolean.FALSE;
+        if (getServiceFactory().getWrapped() != null) {
+            return getServiceFactory().getWrapped();
         }
         m = getDeclaredMethod(m);
 

Modified: 
incubator/cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/ReflectionServiceFactoryBean.java
URL: 
http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/ReflectionServiceFactoryBean.java?view=diff&rev=541860&r1=541859&r2=541860
==============================================================================
--- 
incubator/cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/ReflectionServiceFactoryBean.java
 (original)
+++ 
incubator/cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/ReflectionServiceFactoryBean.java
 Fri May 25 22:25:28 2007
@@ -1365,6 +1365,13 @@
         this.wrappedStyle = style;
     }
 
+    /**
+     *  Returns non-null if wrapped mode was explicitely disabled or enabled. 
+     */
+    public Boolean getWrapped() {
+        return this.wrappedStyle;
+    }
+    
     public Map<String, Object> getProperties() {
         return properties;
     }