You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2012/01/12 22:52:38 UTC
svn commit: r1230801 - in /cxf/branches/2.5.x-fixes: ./
rt/databinding/jibx/src/main/java/org/apache/cxf/jibx/tools/JibxToolingDataBinding.java
Author: dkulp
Date: Thu Jan 12 21:52:38 2012
New Revision: 1230801
URL: http://svn.apache.org/viewvc?rev=1230801&view=rev
Log:
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.5.x-fixes/ (props changed)
cxf/branches/2.5.x-fixes/rt/databinding/jibx/src/main/java/org/apache/cxf/jibx/tools/JibxToolingDataBinding.java
Propchange: cxf/branches/2.5.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jan 12 21:52:38 2012
@@ -1,3 +1,3 @@
/cxf/branches/wss4j-1.6-port:1043100-1069432
/cxf/sandbox/wss4j-1.6-port:1031652-1043098
-/cxf/trunk:1229663,1229965
+/cxf/trunk:1229663,1229965,1230800
Propchange: cxf/branches/2.5.x-fixes/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Thu Jan 12 21:52:38 2012
@@ -1 +1 @@
-/cxf/trunk:1-1227739,1229663,1229965
+/cxf/trunk:1-1227739,1229663,1229965,1230800
Modified: cxf/branches/2.5.x-fixes/rt/databinding/jibx/src/main/java/org/apache/cxf/jibx/tools/JibxToolingDataBinding.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/rt/databinding/jibx/src/main/java/org/apache/cxf/jibx/tools/JibxToolingDataBinding.java?rev=1230801&r1=1230800&r2=1230801&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/rt/databinding/jibx/src/main/java/org/apache/cxf/jibx/tools/JibxToolingDataBinding.java (original)
+++ cxf/branches/2.5.x-fixes/rt/databinding/jibx/src/main/java/org/apache/cxf/jibx/tools/JibxToolingDataBinding.java Thu Jan 12 21:52:38 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) {