Interop mapping changes/ fixes

[simantics/interop.git] / org.simantics.interop.mapping / src / org / simantics / interop / mapping / Mapper.java

diff --git a/org.simantics.interop.mapping/src/org/simantics/interop/mapping/Mapper.java b/org.simantics.interop.mapping/src/org/simantics/interop/mapping/Mapper.java
index 3414d4d05f17aafada5b733579783ae245974865..60c5c4835862dd683b78c8ab1c4149b13ebd0200 100644 (file)
--- a/org.simantics.interop.mapping/src/org/simantics/interop/mapping/Mapper.java
+++ b/org.simantics.interop.mapping/src/org/simantics/interop/mapping/Mapper.java
@@ -17,7 +17,6 @@ import org.simantics.db.common.request.WriteRequest;
 import org.simantics.db.common.request.WriteResultRequest;\r
 import org.simantics.db.common.utils.NameUtils;\r
 import org.simantics.db.exception.DatabaseException;\r
-import org.simantics.db.exception.ServiceException;\r
 import org.simantics.db.layer0.util.SessionGarbageCollection;\r
 import org.simantics.db.request.Read;\r
 import org.simantics.interop.mapping.data.GraphNode;\r
@@ -353,9 +352,11 @@ public class Mapper {
                        for (GraphNode<Identifiable> n : nodes) {\r
 \r
                                MapList<Integer,GenerationRule> priRules = n.getHint(MappingHints.KEY_GENERATION_RULES);\r
-                               List<GenerationRule> rules = priRules.getValues(stage);\r
-                               for (GenerationRule r : rules) {\r
-                                       r.generate(graph, n);\r
+                               if (priRules != null) {\r
+                                       List<GenerationRule> rules = priRules.getValues(stage);\r
+                                       for (GenerationRule r : rules) {\r
+                                               r.generate(graph, n);\r
+                                       }\r
                                }\r
 \r
                                monitor.subTask("Generating objects, stage " + stage + " :  ("+ (++count) + "/" + size + ")");\r