bugfix nullpointerexception minimizestatement

opitzconsulting · Oct 10, 2017 · b80e364 · b80e364
1 parent c21d71e
commit b80e364
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/...s_core/build_source/orcas_diff/src/main/java/de/opitzconsulting/orcas/diff/OrcasDiff.java b/...s_core/build_source/orcas_diff/src/main/java/de/opitzconsulting/orcas/diff/OrcasDiff.java
@@ -394,9 +394,12 @@ private <T extends AbstractDiff> RecreateNeededBuilder<T> setRecreateNeededFor(
     return recreateNeededRegistry.createRecreateNeededBuilder( pDiff );
   }
 
-  private Optional<TableDiff> findTableDiff( ModelDiff pModelDiff, String pTableName )
+  private Optional<TableDiff> findTableDiffByOldName( ModelDiff pModelDiff, String pTableName )
   {
-    return pModelDiff.model_elementsTableDiff.stream().filter( p -> p.nameOld.equals( pTableName ) ).findAny();
+    return pModelDiff.model_elementsTableDiff.stream()//
+    .filter( p -> p.isOld )//
+    .filter( p -> p.nameOld.equals( pTableName ) )//
+    .findAny();
   }
 
   private List<DiffActionReason> getRefConstraintRecreate( ModelDiff pModelDiff, String pDestTableName, List<ColumnRefDiff> pDestColumnsDiff )
@@ -548,7 +551,7 @@ private void updateImplicitDropList( ModelDiff pModelDiff )
           return false;
         }
 
-        Optional<TableDiff> lDestTableDiff = findTableDiff( pModelDiff, pDiff.destTableOld );
+        Optional<TableDiff> lDestTableDiff = findTableDiffByOldName( pModelDiff, pDiff.destTableOld );
         if( lDestTableDiff.isPresent() )
         {
           return ddlBuilder.isAllColumnsNew( pDiff.destColumnsDiff, lDestTableDiff.get() );