svn commit: r892894 - in /cxf/branches/2.2.x-fixes: ./ common/common/src/main/java/org/apache/cxf/common/util/SpringAopClassHelper.java

[sergeyb]

Author: sergeyb
Date: Mon Dec 21 17:39:42 2009
New Revision: 892894

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

........
  r892890 | sergeyb | 2009-12-21 17:24:59 +0000 (Mon, 21 Dec 2009) | 1 line
  
  Minor update to SpringAopClassHelper to ensure double cglib proxies are 
handled
........

Modified:
    cxf/branches/2.2.x-fixes/   (props changed)
    
cxf/branches/2.2.x-fixes/common/common/src/main/java/org/apache/cxf/common/util/SpringAopClassHelper.java

Propchange: cxf/branches/2.2.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Dec 21 17:39:42 2009
@@ -1 +1 @@
-/cxf/trunk:891375-891393,891452,891817,891827,891859,891945-891946,892056,892307,892360,892664
+/cxf/trunk:891375-891393,891452,891817,891827,891859,891945-891946,892056,892307,892360,892664,892890

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

Modified: 
cxf/branches/2.2.x-fixes/common/common/src/main/java/org/apache/cxf/common/util/SpringAopClassHelper.java
URL: 
http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/common/common/src/main/java/org/apache/cxf/common/util/SpringAopClassHelper.java?rev=892894&r1=892893&r2=892894&view=diff
==============================================================================
--- 
cxf/branches/2.2.x-fixes/common/common/src/main/java/org/apache/cxf/common/util/SpringAopClassHelper.java
 (original)
+++ 
cxf/branches/2.2.x-fixes/common/common/src/main/java/org/apache/cxf/common/util/SpringAopClassHelper.java
 Mon Dec 21 17:39:42 2009
@@ -54,7 +54,7 @@
             }
             
         } else if (AopUtils.isCglibProxyClass(o.getClass())) {
-            return AopUtils.getTargetClass(o);
+            return getRealClassFromClassInternal(AopUtils.getTargetClass(o));
         }
         return o.getClass();
     }