From 22e2de60343b04939f745f108a906d3ac59f9a27 Mon Sep 17 00:00:00 2001
From: Roger Leigh <rleigh@codelibre.net>
Date: Sat, 23 Jun 2018 16:15:29 +0100
Subject: [PATCH] ome-xml: java: Don't report unhandled links prematurely

---
 .../main/java/ome/xml/model/AbstractOMEModelObject.java  | 9 +++++++++
 xsd-fu/templates/java/OMEXMLModelObject.template         | 8 +-------
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/ome-xml/src/main/java/ome/xml/model/AbstractOMEModelObject.java b/ome-xml/src/main/java/ome/xml/model/AbstractOMEModelObject.java
index 96f525249..54da63e12 100644
--- a/ome-xml/src/main/java/ome/xml/model/AbstractOMEModelObject.java
+++ b/ome-xml/src/main/java/ome/xml/model/AbstractOMEModelObject.java
@@ -44,12 +44,19 @@
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 /**
  * @author callan
  *
  */
 public abstract class AbstractOMEModelObject implements OMEModelObject {
 
+  /** Logger for this class. */
+  protected static final Logger LOGGER =
+    LoggerFactory.getLogger(AbstractOMEModelObject.class);
+
   /* (non-Javadoc)
    * @see ome.xml.r201004.OMEModelObject#update(org.w3c.dom.Element, ome.xml.r201004.OMEModel)
    */
@@ -82,6 +89,8 @@ protected Element asXMLElement(Document document, Element element) {
    */
   @Override
   public boolean link(Reference reference, OMEModelObject o) {
+    LOGGER.debug("{} unable to handle reference of type {} for {}",
+                 getClass(), reference.getClass(), o.getClass());
     return false;
   }
 
diff --git a/xsd-fu/templates/java/OMEXMLModelObject.template b/xsd-fu/templates/java/OMEXMLModelObject.template
index 20f2d81dc..a62f6b9c4 100644
--- a/xsd-fu/templates/java/OMEXMLModelObject.template
+++ b/xsd-fu/templates/java/OMEXMLModelObject.template
@@ -465,11 +465,6 @@ ${customUpdatePropertyContent[prop.name]}
 
   public boolean link(Reference reference, OMEModelObject o)
   {
-    boolean wasHandledBySuperClass = super.link(reference, o);
-    if (wasHandledBySuperClass)
-    {
-      return true;
-    }
 {% for prop in klass.properties.values() %}\
 {% if prop.isReference %}\
     if (reference instanceof ${prop.name})
@@ -493,8 +488,7 @@ ${customUpdatePropertyContent[prop.name]}
     }
 {% end %}\
 {% end %}\
-    LOGGER.debug("Unable to handle reference of type: {}", reference.getClass());
-    return false;
+    return super.link(reference, o);
   }
 {% if klass.langBaseType != 'Object' %}\
   // Element's text data getter