cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r582943 - in /incubator/cxf/branches/2.0.x-fixes: ./ common/common/src/main/java/org/apache/cxf/common/injection/ systests/src/test/java/org/apache/cxf/systest/http_jetty/
Date Mon, 08 Oct 2007 19:06:19 GMT
Author: dkulp
Date: Mon Oct  8 12:06:17 2007
New Revision: 582943

URL: http://svn.apache.org/viewvc?rev=582943&view=rev
Log:
Merged revisions 582082 via svnmerge from 
https://svn.apache.org/repos/asf/incubator/cxf/trunk

........
  r582082 | ningjiang | 2007-10-05 01:49:08 -0400 (Fri, 05 Oct 2007) | 1 line
  
  CXF-1086 got the http-jetty systest worked and also  fixed the jaxws unitest failures which
were caused by my last commit
........

Added:
    incubator/cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/http_jetty/
      - copied from r582082, incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/http_jetty/
    incubator/cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/http_jetty/Dummy.java
      - copied unchanged from r582082, incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/http_jetty/Dummy.java
    incubator/cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/http_jetty/DummyInterface.java
      - copied unchanged from r582082, incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/http_jetty/DummyInterface.java
    incubator/cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/http_jetty/EngineLifecycleTest.java
      - copied unchanged from r582082, incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/http_jetty/EngineLifecycleTest.java
    incubator/cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/http_jetty/jetty-engine.xml
      - copied unchanged from r582082, incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/http_jetty/jetty-engine.xml
    incubator/cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/http_jetty/server-lifecycle-beans.xml
      - copied unchanged from r582082, incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/http_jetty/server-lifecycle-beans.xml
Modified:
    incubator/cxf/branches/2.0.x-fixes/   (props changed)
    incubator/cxf/branches/2.0.x-fixes/common/common/src/main/java/org/apache/cxf/common/injection/ResourceInjector.java

Propchange: incubator/cxf/branches/2.0.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: incubator/cxf/branches/2.0.x-fixes/common/common/src/main/java/org/apache/cxf/common/injection/ResourceInjector.java
URL: http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/common/common/src/main/java/org/apache/cxf/common/injection/ResourceInjector.java?rev=582943&r1=582942&r2=582943&view=diff
==============================================================================
--- incubator/cxf/branches/2.0.x-fixes/common/common/src/main/java/org/apache/cxf/common/injection/ResourceInjector.java
(original)
+++ incubator/cxf/branches/2.0.x-fixes/common/common/src/main/java/org/apache/cxf/common/injection/ResourceInjector.java
Mon Oct  8 12:06:17 2007
@@ -237,10 +237,14 @@
 
     private void invokeSetter(Method method, Object resource) { 
         try {
-            method.setAccessible(true);            
-            Method targetMethod = getTarget().getClass().
+            method.setAccessible(true);
+            if (method.getDeclaringClass().isAssignableFrom(getTarget().getClass())) {
+                method.invoke(getTarget(), resource);
+            } else { // deal with the proxy setter method
+                Method targetMethod = getTarget().getClass().
                 getMethod(method.getName(), new Class[]{resource.getClass()});
-            targetMethod.invoke(getTarget(), resource);
+                targetMethod.invoke(getTarget(), resource);
+            }
         } catch (IllegalAccessException e) { 
             LOG.log(Level.SEVERE, "INJECTION_SETTER_NOT_VISIBLE", method);
         } catch (InvocationTargetException e) { 
@@ -248,7 +252,7 @@
         } catch (SecurityException e) {
             LogUtils.log(LOG, Level.SEVERE, "INJECTION_SETTER_RAISED_EXCEPTION", e, method);
         } catch (NoSuchMethodException e) {
-            LOG.log(Level.SEVERE, "INJECTION_SETTER_METHOD_NOT_FOUND", method);
+            LOG.log(Level.SEVERE, "INJECTION_SETTER_METHOD_NOT_FOUND", new Object[] {method.getName()});
         } 
     } 
 



Mime
View raw message