olingo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chri...@apache.org
Subject [1/2] olingo-odata4 git commit: [OLINGO-1166] Fix serialization of annotations for enum members in the CSDL
Date Fri, 08 Sep 2017 13:01:07 GMT
Repository: olingo-odata4
Updated Branches:
  refs/heads/master 0a2ebd795 -> b5ff47837


[OLINGO-1166] Fix serialization of annotations for enum members in the CSDL

Signed-off-by: Christian Amend <christian.amend@sap.com>


Project: http://git-wip-us.apache.org/repos/asf/olingo-odata4/repo
Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata4/commit/16afaa6f
Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata4/tree/16afaa6f
Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata4/diff/16afaa6f

Branch: refs/heads/master
Commit: 16afaa6f68e5787400d71035b35f06ba650e2b88
Parents: 0a2ebd7
Author: Tom van Wietmarschen <aaargh@gmail.com>
Authored: Thu Aug 17 13:11:24 2017 +0200
Committer: Christian Amend <christian.amend@sap.com>
Committed: Fri Sep 8 14:56:59 2017 +0200

----------------------------------------------------------------------
 .../server/core/serializer/xml/MetadataDocumentXmlSerializer.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/16afaa6f/lib/server-core/src/main/java/org/apache/olingo/server/core/serializer/xml/MetadataDocumentXmlSerializer.java
----------------------------------------------------------------------
diff --git a/lib/server-core/src/main/java/org/apache/olingo/server/core/serializer/xml/MetadataDocumentXmlSerializer.java
b/lib/server-core/src/main/java/org/apache/olingo/server/core/serializer/xml/MetadataDocumentXmlSerializer.java
index fe0fb54..a5ae088 100644
--- a/lib/server-core/src/main/java/org/apache/olingo/server/core/serializer/xml/MetadataDocumentXmlSerializer.java
+++ b/lib/server-core/src/main/java/org/apache/olingo/server/core/serializer/xml/MetadataDocumentXmlSerializer.java
@@ -934,7 +934,7 @@ public class MetadataDocumentXmlSerializer {
       writer.writeAttribute(XML_UNDERLYING_TYPE, getFullQualifiedName(enumType.getUnderlyingType(),
false));
 
       for (String memberName : enumType.getMemberNames()) {
-        writer.writeEmptyElement(XML_MEMBER);
+        writer.writeStartElement(XML_MEMBER);
         writer.writeAttribute(XML_NAME, memberName);
 
         EdmMember member = enumType.getMember(memberName);
@@ -943,6 +943,7 @@ public class MetadataDocumentXmlSerializer {
         }
 
         appendAnnotations(writer, member);
+        writer.writeEndElement();
       }
 
       writer.writeEndElement();


Mime
View raw message