more sdo fixes

Signed-off-by: Lukas Jungmann <lukas.jungmann@oracle.com>
eclipse-ee4j · Sep 7, 2021 · 328b3dd · 328b3dd
1 parent d801704
commit 328b3dd
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/...org/eclipse/persistence/testing/sdo/helper/jaxbhelper/containment/ContainmentProject.java b/...org/eclipse/persistence/testing/sdo/helper/jaxbhelper/containment/ContainmentProject.java
@@ -71,14 +71,18 @@ private XMLDescriptor getRootDescriptor() {
 
         XMLCompositeObjectMapping mapping = new XMLCompositeObjectMapping();
         mapping.setReferenceClass(Child.class);
-        mapping.getInverseReferenceMapping().setAttributeName("container");
+        if (mapping.getInverseReferenceMapping() != null) {
+            mapping.getInverseReferenceMapping().setAttributeName("container");
+        }
         mapping.setAttributeName("childProperty");
         mapping.setXPath("tns:child");
         xmlDescriptor.addMapping(mapping);
 
         XMLCompositeCollectionMapping mapping2 = new XMLCompositeCollectionMapping();
         mapping2.setReferenceClass(Child.class);
-        mapping2.getInverseReferenceMapping().setAttributeName("container");
+        if (mapping.getInverseReferenceMapping() != null) {
+            mapping2.getInverseReferenceMapping().setAttributeName("container");
+        }
         mapping2.setAttributeName("childCollectionProperty");
         mapping2.setXPath("tns:child-many");
         mapping2.getContainerPolicy().setContainerClass(ArrayList.class);

diff --git a/...c/test/java/org/eclipse/persistence/testing/sdo/helper/jaxbhelper/isset/IsSetProject.java b/...c/test/java/org/eclipse/persistence/testing/sdo/helper/jaxbhelper/isset/IsSetProject.java
@@ -71,14 +71,18 @@ private XMLDescriptor getRootDescriptor() {
 
         XMLCompositeObjectMapping mapping = new XMLCompositeObjectMapping();
         mapping.setReferenceClass(Child.class);
-        mapping.getInverseReferenceMapping().setAttributeName("container");
+        if (mapping.getInverseReferenceMapping() != null) {
+            mapping.getInverseReferenceMapping().setAttributeName("container");
+        }
         mapping.setAttributeName("childProperty");
         mapping.setXPath("tns:child");
         xmlDescriptor.addMapping(mapping);
 
         XMLCompositeCollectionMapping mapping2 = new XMLCompositeCollectionMapping();
         mapping2.setReferenceClass(Child.class);
-        mapping2.getInverseReferenceMapping().setAttributeName("container");
+        if (mapping.getInverseReferenceMapping() != null) {
+            mapping2.getInverseReferenceMapping().setAttributeName("container");
+        }
         mapping2.setAttributeName("childCollectionProperty");
         mapping2.setXPath("tns:child-many");
         mapping2.getContainerPolicy().setContainerClass(ArrayList.class);