Author: justin Date: Mon Jun 19 14:45:05 2017 New Revision: 1799218 URL: http://svn.apache.org/viewvc?rev=1799218&view=rev Log: SLING-6965 - remove duplicate object start in ResourceSeriailzer
Modified: sling/trunk/bundles/extensions/models/integration-tests/src/main/java/org/apache/sling/models/it/exporter/ExporterTest.java sling/trunk/bundles/extensions/models/jackson-exporter/src/main/java/org/apache/sling/models/jacksonexporter/impl/ResourceSerializer.java Modified: sling/trunk/bundles/extensions/models/integration-tests/src/main/java/org/apache/sling/models/it/exporter/ExporterTest.java URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/models/integration-tests/src/main/java/org/apache/sling/models/it/exporter/ExporterTest.java?rev=1799218&r1=1799217&r2=1799218&view=diff ============================================================================== --- sling/trunk/bundles/extensions/models/integration-tests/src/main/java/org/apache/sling/models/it/exporter/ExporterTest.java (original) +++ sling/trunk/bundles/extensions/models/integration-tests/src/main/java/org/apache/sling/models/it/exporter/ExporterTest.java Mon Jun 19 14:45:05 2017 @@ -91,6 +91,8 @@ public class ExporterTest { "sling/exp/base"); ResourceUtil.getOrCreateResource(adminResolver, baseComponentPath, properties, null, false); + ResourceUtil.getOrCreateResource(adminResolver, baseComponentPath + "/child", Collections.<String, Object>emptyMap(), null, false); + properties.put(SlingConstants.NAMESPACE_PREFIX + ":" + SlingConstants.PROPERTY_RESOURCE_TYPE, "sling/exp-request/base"); ResourceUtil.getOrCreateResource(adminResolver, baseRequestComponentPath, properties, null, false); Modified: sling/trunk/bundles/extensions/models/jackson-exporter/src/main/java/org/apache/sling/models/jacksonexporter/impl/ResourceSerializer.java URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/models/jackson-exporter/src/main/java/org/apache/sling/models/jacksonexporter/impl/ResourceSerializer.java?rev=1799218&r1=1799217&r2=1799218&view=diff ============================================================================== --- sling/trunk/bundles/extensions/models/jackson-exporter/src/main/java/org/apache/sling/models/jacksonexporter/impl/ResourceSerializer.java (original) +++ sling/trunk/bundles/extensions/models/jackson-exporter/src/main/java/org/apache/sling/models/jacksonexporter/impl/ResourceSerializer.java Mon Jun 19 14:45:05 2017 @@ -96,7 +96,7 @@ public class ResourceSerializer extends // the child nodes if (recursionLevelActive(currentRecursionLevel)) { for (final Resource n : resource.getChildren()) { - jgen.writeObjectFieldStart(n.getName()); + jgen.writeFieldName(n.getName()); create(n, jgen, currentRecursionLevel + 1, provider); } }