Changeset 22703

Timestamp:

03/09/10 13:48:59 (17 months ago)

Author:

mnw21

Message:

Belt and braces on the dataloader

File:

• branches/mnw21/pathquery_refactor/intermine/integrate/main/src/org/intermine/dataloader/SourcePriorityComparator.java (modified) (1 diff)

branches/mnw21/pathquery_refactor/intermine/integrate/main/src/org/intermine/dataloader/SourcePriorityComparator.java

@@ -203 +203 @@
         try {
             if ((o1 == defObj) && (value1 instanceof InterMineObject)) {
+                if (value1 instanceof ProxyReference) {
+                    ProxyReference ref = (ProxyReference) value1;
+                    if (iw.idMap.get(ref.getId()) == null) {
+                        LOG.error("Having to fetch reference " + fieldName + " for object with ID "
+                                + o1.getId() + " referencing object with ID " + ref.getId());
+                        value1 = ref.getObject();
+                    }
+                }
                 value1 = iw.store((InterMineObject) value1, source, skelSource, SKELETON);
             }
             if ((o2 == defObj) && (value2 instanceof InterMineObject)) {
+                if (value2 instanceof ProxyReference) {
+                    ProxyReference ref = (ProxyReference) value2;
+                    if (iw.idMap.get(ref.getId()) == null) {
+                        LOG.error("Having to fetch reference " + fieldName + " for object with ID "
+                                + o1.getId() + " referencing object with ID " + ref.getId());
+                        value2 = ref.getObject();
+                    }
+                }
                 value2 = iw.store((InterMineObject) value2, source, skelSource, SKELETON);
             }