You are viewing a plain text version of this content. The canonical link for it is here.
Posted to yoko-commits@incubator.apache.org by br...@apache.org on 2007/04/03 17:25:41 UTC
svn commit: r525214 - in
/incubator/yoko/trunk/bindings/src/main/java/org/apache/yoko/bindings/corba/runtime:
CorbaObjectReader.java CorbaStaxObject.java
Author: bravi
Date: Tue Apr 3 10:25:40 2007
New Revision: 525214
URL: http://svn.apache.org/viewvc?view=rev&rev=525214
Log:
[YOKO-331] - Initialized the corba union handler with proper values when created inside an unbounded sequence.
Modified:
incubator/yoko/trunk/bindings/src/main/java/org/apache/yoko/bindings/corba/runtime/CorbaObjectReader.java
incubator/yoko/trunk/bindings/src/main/java/org/apache/yoko/bindings/corba/runtime/CorbaStaxObject.java
Modified: incubator/yoko/trunk/bindings/src/main/java/org/apache/yoko/bindings/corba/runtime/CorbaObjectReader.java
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/bindings/src/main/java/org/apache/yoko/bindings/corba/runtime/CorbaObjectReader.java?view=diff&rev=525214&r1=525213&r2=525214
==============================================================================
--- incubator/yoko/trunk/bindings/src/main/java/org/apache/yoko/bindings/corba/runtime/CorbaObjectReader.java (original)
+++ incubator/yoko/trunk/bindings/src/main/java/org/apache/yoko/bindings/corba/runtime/CorbaObjectReader.java Tue Apr 3 10:25:40 2007
@@ -336,7 +336,6 @@
} else {
discLabel = ((CorbaPrimitiveHandler)discriminator).getDataFromValue();
}
-
// Now find the label in the union to get the right case
Unionbranch defaultBranch = null;
boolean caseFound = false;
@@ -466,6 +465,14 @@
for (int i = 0; i < elements.size(); i++) {
CorbaObjectHandler element = initializeCorbaObjectHandler(elements.get(i));
array.addElement(element);
+ }
+ } else if (template instanceof CorbaUnionHandler) {
+ CorbaUnionHandler templateUnion = (CorbaUnionHandler) template;
+ CorbaUnionHandler union = (CorbaUnionHandler) handler;
+ union.setDiscriminator(initializeCorbaObjectHandler(templateUnion.getDiscriminator()));
+ List<CorbaObjectHandler> cases = templateUnion.getCases();
+ for (int i = 0; i < cases.size(); i++) {
+ union.addCase(initializeCorbaObjectHandler(cases.get(i)));
}
}
Modified: incubator/yoko/trunk/bindings/src/main/java/org/apache/yoko/bindings/corba/runtime/CorbaStaxObject.java
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/bindings/src/main/java/org/apache/yoko/bindings/corba/runtime/CorbaStaxObject.java?view=diff&rev=525214&r1=525213&r2=525214
==============================================================================
--- incubator/yoko/trunk/bindings/src/main/java/org/apache/yoko/bindings/corba/runtime/CorbaStaxObject.java (original)
+++ incubator/yoko/trunk/bindings/src/main/java/org/apache/yoko/bindings/corba/runtime/CorbaStaxObject.java Tue Apr 3 10:25:40 2007
@@ -801,17 +801,6 @@
reader.nextEvent().asStartElement();
event = reader.peek();
}
-
- /*
- if (event.isStartElement()) {
- StartElement startEl = (StartElement) event;
- if (!startEl.getName().equals(el.getQName())) {
- syncRead = true;
- reader.nextEvent().asStartElement();
- event = reader.peek();
- }
- }
- */
while (event.getEventType() == XMLStreamConstants.START_ELEMENT) {
StartElement startEl = (StartElement) event;
//REVISIT, check if qualified or unqualified
@@ -1171,7 +1160,6 @@
// Build the entire union with all branches, etc. Then read info from the XML Event Reader
String branchName = null;
XMLEvent evt = reader.peek();
-
if (evt.isStartElement()) {
branchName = evt.asStartElement().getName().getLocalPart();
}