cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From e..@apache.org
Subject svn commit: r1438435 - in /cxf/branches/2.6.x-fixes: ./ rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/Utils.java rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/UtilsTest.java
Date Fri, 25 Jan 2013 10:43:00 GMT
Author: ema
Date: Fri Jan 25 10:43:00 2013
New Revision: 1438435

URL: http://svn.apache.org/viewvc?rev=1438435&view=rev
Log:
Merged revisions 1438427,1438432 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/branches/2.7.x-fixes

................
  r1438427 | ema | 2013-01-25 18:28:28 +0800 (Fri, 25 Jan 2013) | 9 lines
  
  Merged revisions 1438421 via svnmerge from 
  https://svn.apache.org/repos/asf/cxf/trunk
  
  ........
    r1438421 | ema | 2013-01-25 18:22:48 +0800 (Fri, 25 Jan 2013) | 1 line
    
    [CXF-4735]:Fix the jaxb Utils.getGetters doesn't exclude toString()
  ........
................
  r1438432 | ema | 2013-01-25 18:38:28 +0800 (Fri, 25 Jan 2013) | 1 line
  
  [CXF-4735]:Add the test case not merged by previous commit
................

Added:
    cxf/branches/2.6.x-fixes/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/UtilsTest.java
      - copied unchanged from r1438432, cxf/branches/2.7.x-fixes/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/UtilsTest.java
Modified:
    cxf/branches/2.6.x-fixes/   (props changed)
    cxf/branches/2.6.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/Utils.java

Propchange: cxf/branches/2.6.x-fixes/
------------------------------------------------------------------------------
  Reverse-merged /cxf/branches/2.7.x-fixes:r1438101,1438416
  Reverse-merged /cxf/trunk:r1438059,1438084,1438414
  Merged /cxf/branches/2.7.x-fixes:r1438427,1438432
  Merged /cxf/trunk:r1438421

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

Modified: cxf/branches/2.6.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/Utils.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/Utils.java?rev=1438435&r1=1438434&r2=1438435&view=diff
==============================================================================
--- cxf/branches/2.6.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/Utils.java
(original)
+++ cxf/branches/2.6.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/Utils.java
Fri Jan 25 10:43:00 2013
@@ -153,7 +153,9 @@ final class Utils {
             if (setter != null) {
                 return !setter.isAnnotationPresent(XmlTransient.class);
             }
-            return true;
+            if (getterIndex(m.getName()) > -1) {
+                return true;
+            }
         }
         return false;
     }



Mime
View raw message