cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r1230802 - in /cxf/branches/2.4.x-fixes: ./ rt/databinding/jibx/src/main/java/org/apache/cxf/jibx/tools/JibxToolingDataBinding.java
Date Thu, 12 Jan 2012 21:53:33 GMT
Author: dkulp
Date: Thu Jan 12 21:53:33 2012
New Revision: 1230802

URL: http://svn.apache.org/viewvc?rev=1230802&view=rev
Log:
Merged revisions 1230801 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/branches/2.5.x-fixes

................
  r1230801 | dkulp | 2012-01-12 16:52:38 -0500 (Thu, 12 Jan 2012) | 10 lines
  
  Merged revisions 1230800 via svnmerge from 
  https://svn.apache.org/repos/asf/cxf/trunk
  
  ........
    r1230800 | dkulp | 2012-01-12 16:51:43 -0500 (Thu, 12 Jan 2012) | 2 lines
    
    Add some NPE guards in Jibx tooling
    Fix an issue reported on the list.
  ........
................

Modified:
    cxf/branches/2.4.x-fixes/   (props changed)
    cxf/branches/2.4.x-fixes/rt/databinding/jibx/src/main/java/org/apache/cxf/jibx/tools/JibxToolingDataBinding.java

Propchange: cxf/branches/2.4.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jan 12 21:53:33 2012
@@ -1,2 +1,2 @@
-/cxf/branches/2.5.x-fixes:1229669,1229966
-/cxf/trunk:1229663,1229965
+/cxf/branches/2.5.x-fixes:1229669,1229966,1230801
+/cxf/trunk:1229663,1229965,1230800

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

Modified: cxf/branches/2.4.x-fixes/rt/databinding/jibx/src/main/java/org/apache/cxf/jibx/tools/JibxToolingDataBinding.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/rt/databinding/jibx/src/main/java/org/apache/cxf/jibx/tools/JibxToolingDataBinding.java?rev=1230802&r1=1230801&r2=1230802&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/rt/databinding/jibx/src/main/java/org/apache/cxf/jibx/tools/JibxToolingDataBinding.java
(original)
+++ cxf/branches/2.4.x-fixes/rt/databinding/jibx/src/main/java/org/apache/cxf/jibx/tools/JibxToolingDataBinding.java
Thu Jan 12 21:53:33 2012
@@ -166,12 +166,15 @@ public class JibxToolingDataBinding impl
                 codegen.compile();
             }
 
-            BindingUtils.getDefinitions(codegen.getRootBinding(), types, elements, null);
+            Map<QName, Object> formats = new HashMap<QName, Object>();
+            BindingUtils.getDefinitions(codegen.getRootBinding(), types, elements, formats);
             
             Iterator it = codegen.getBindingOrganizer().iterateBindings();
             while (it.hasNext()) {
                 BindingHolder o = (BindingHolder)it.next();
-                getDefinitions(o, types, elements);
+                if (o != null) {
+                    getDefinitions(o, types, elements);
+                }
             }
 
         } catch (Exception e) {



Mime
View raw message