cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From serg...@apache.org
Subject svn commit: r1090250 - in /cxf/branches/2.3.x-fixes: ./ rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/InjectionUtils.java
Date Fri, 08 Apr 2011 13:51:36 GMT
Author: sergeyb
Date: Fri Apr  8 13:51:36 2011
New Revision: 1090250

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

........
  r1090249 | sergeyb | 2011-04-08 14:50:07 +0100 (Fri, 08 Apr 2011) | 1 line
  
  [CXF-3446] Blocking enum.getDeclaringClass
........

Modified:
    cxf/branches/2.3.x-fixes/   (props changed)
    cxf/branches/2.3.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/InjectionUtils.java

Propchange: cxf/branches/2.3.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Apr  8 13:51:36 2011
@@ -1 +1 @@
-/cxf/trunk:1090225-1090227
+/cxf/trunk:1090225-1090227,1090249

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

Modified: cxf/branches/2.3.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/InjectionUtils.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/InjectionUtils.java?rev=1090250&r1=1090249&r2=1090250&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/InjectionUtils.java
(original)
+++ cxf/branches/2.3.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/InjectionUtils.java
Fri Apr  8 13:51:36 2011
@@ -911,7 +911,9 @@ public final class InjectionUtils {
                     propertyName = propertyName.substring(0, 1).toLowerCase()
                                    + propertyName.substring(1);
                 }
-                if (baseName.contains(propertyName) || "class".equals(propertyName)) {
+                if (baseName.contains(propertyName) 
+                    || "class".equals(propertyName)
+                    || "declaringClass".equals(propertyName)) {
                     continue;
                 }
                 if (!"".equals(baseName)) {



Mime
View raw message