Fix merges issues
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/268735e7 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/268735e7 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/268735e7 Branch: refs/heads/3.0.x-fixes Commit: 268735e75d256ec6b1684bfbb4b581c25b679c2d Parents: b8c8ff2 Author: Daniel Kulp <dk...@apache.org> Authored: Mon Feb 9 12:48:41 2015 -0500 Committer: Daniel Kulp <dk...@apache.org> Committed: Mon Feb 9 12:48:55 2015 -0500 ---------------------------------------------------------------------- parent/pom.xml | 2 +- .../src/main/java/org/apache/cxf/javascript/ParticleInfo.java | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/268735e7/parent/pom.xml ---------------------------------------------------------------------- diff --git a/parent/pom.xml b/parent/pom.xml index a8768c0..0a3a2bc 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -41,7 +41,7 @@ <cxf.compile.show.deprecation>true</cxf.compile.show.deprecation> <cxf.codegenplugin.forkmode>once</cxf.codegenplugin.forkmode> <cxf.codegen.jvmArgs /> - <cf.eclipse.outputDirectory>${basedir}/target/classes</cxf.eclipse.outputDirectory> + <cxf.eclipse.outputDirectory>${basedir}/target/classes</cxf.eclipse.outputDirectory> <cxf.saaj.impl.groupId>com.sun.xml.messaging.saaj</cxf.saaj.impl.groupId> <cxf.saaj.impl.artifactId>saaj-impl</cxf.saaj.impl.artifactId> <cxf.saaj.impl.version>1.3.23</cxf.saaj.impl.version> http://git-wip-us.apache.org/repos/asf/cxf/blob/268735e7/rt/javascript/javascript-rt/src/main/java/org/apache/cxf/javascript/ParticleInfo.java ---------------------------------------------------------------------- diff --git a/rt/javascript/javascript-rt/src/main/java/org/apache/cxf/javascript/ParticleInfo.java b/rt/javascript/javascript-rt/src/main/java/org/apache/cxf/javascript/ParticleInfo.java index 4c53d02..9c51e3b 100644 --- a/rt/javascript/javascript-rt/src/main/java/org/apache/cxf/javascript/ParticleInfo.java +++ b/rt/javascript/javascript-rt/src/main/java/org/apache/cxf/javascript/ParticleInfo.java @@ -172,8 +172,9 @@ public final class ParticleInfo implements ItemInfo { elementInfo.children = new LinkedList<ParticleInfo>(); - List<XmlSchemaObject> items = choice.getItems(); - for (XmlSchemaObject item : items) { + List<?> items = choice.getItems(); + for (Object i : items) { + XmlSchemaObject item = (XmlSchemaObject)i; XmlSchemaObject schemaObject = JavascriptUtils.getObjectParticle(item, contextName, currentSchema); ParticleInfo childParticle = ParticleInfo.forLocalItem(schemaObject, currentSchema, schemaCollection,