Author: dkulp
Date: Thu Jan 12 21:51:43 2012
New Revision: 1230800
URL: http://svn.apache.org/viewvc?rev=1230800&view=rev
Log:
Add some NPE guards in Jibx tooling
Fix an issue reported on the list.
Modified:
cxf/trunk/rt/databinding/jibx/src/main/java/org/apache/cxf/jibx/tools/JibxToolingDataBinding.java
Modified:
cxf/trunk/rt/databinding/jibx/src/main/java/org/apache/cxf/jibx/tools/JibxToolingDataBinding.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/jibx/src/main/java/org/apache/cxf/jibx/tools/JibxToolingDataBinding.java?rev=1230800&r1=1230799&r2=1230800&view=diff
==============================================================================
---
cxf/trunk/rt/databinding/jibx/src/main/java/org/apache/cxf/jibx/tools/JibxToolingDataBinding.java
(original)
+++
cxf/trunk/rt/databinding/jibx/src/main/java/org/apache/cxf/jibx/tools/JibxToolingDataBinding.java
Thu Jan 12 21:51:43 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) {
