Changeset 1515

Timestamp:

12/02/08 17:39:55 (5 weeks ago)

Author:

csims

Message:

Fixed bug related to failed answer data serialization

Location:

branches/dev/javarosa/org.javarosa.xform/src/org/javarosa

Files:

• model/xform/XFormSerializingVisitor.java (modified) (1 diff)
• xform/util/XFormAnswerDataSerializer.java (modified) (1 diff)

branches/dev/javarosa/org.javarosa.xform/src/org/javarosa/model/xform/XFormSerializingVisitor.java

@@ -79 +79 @@
                 }
                 Object serializedAnswerData = serializer.serializeAnswerData(element, schema);
-                if(serializedAnswerData.getClass() == String.class) {
+                if(serializedAnswerData == null) {
+                        //#if debug.output==verbose || debug.output==exception 
+                                if(element != null) {
+                                        System.out.println("Warning: Wasn't able to Serialize element: " + element.getName());
+                                }
+                        //#endif
+                }
+                if(serializedAnswerData instanceof String) {
                         text.addChild(Element.TEXT, serializedAnswerData);
                 } else if(serializedAnswerData instanceof Element) {

branches/dev/javarosa/org.javarosa.xform/src/org/javarosa/xform/util/XFormAnswerDataSerializer.java

@@ -129 +129 @@
                                 }
                         }
+                        else {
+                                return data;
+                        }
                 }
                 return null;