ticket #27628 不正なFKデータをスキップする

diff --git a/ea2ddl-ddl/src/main/java/jp/sourceforge/ea2ddl/ddl/factory/impl/DatabaseModelFactoryImpl.java b/ea2ddl-ddl/src/main/java/jp/sourceforge/ea2ddl/ddl/factory/impl/DatabaseModelFactoryImpl.java
index ec68d4e..b5bbe92 100644 (file)
--- a/ea2ddl-ddl/src/main/java/jp/sourceforge/ea2ddl/ddl/factory/impl/DatabaseModelFactoryImpl.java
+++ b/ea2ddl-ddl/src/main/java/jp/sourceforge/ea2ddl/ddl/factory/impl/DatabaseModelFactoryImpl.java
@@ -1,5 +1,5 @@
 /**\r
 /**\r

- * \r
+ *\r

  */\r
 package jp.sourceforge.ea2ddl.ddl.factory.impl;\r
 \r
  */\r
 package jp.sourceforge.ea2ddl.ddl.factory.impl;\r
 \r


@@ -208,6 +208,13 @@ public class DatabaseModelFactoryImpl implements ModelFactory {
                                                new LikeSearchOption().likeContain());\r
                                final TConnector con = _tConnectorBhv.selectEntity(conCB);\r
 \r
                                                new LikeSearchOption().likeContain());\r
                                final TConnector con = _tConnectorBhv.selectEntity(conCB);\r
 \r

+                               // EAでFKのごみが残ることがある。ごみの情報をログに出してスキップする\r
+                               if (con == null) {\r
+                                       _log.warn("Invalid FK was found. Skipped: "\r
+                                                       + opeFK.getName() + " of " + tobject.getName());\r
+                                       continue;\r
+                               }\r
+\r

                                final TObject targetTable = _tObjectBhv.selectEntity(con\r
                                                .getEndObjectId());\r
                                fkModel.setTargetTable(targetTable.getName());\r
                                final TObject targetTable = _tObjectBhv.selectEntity(con\r
                                                .getEndObjectId());\r
                                fkModel.setTargetTable(targetTable.getName());\r