Procházet zdrojové kódy

AMBARI-11840. Ambari upgrade crashed due to unable to process WidgetLayoutEntries.(vbrodetskyi)

Vitaly Brodetskyi před 10 roky
rodič
revize
829a5e85cb

+ 0 - 1
ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementControllerImpl.java

@@ -4221,7 +4221,6 @@ public class AmbariManagementControllerImpl implements AmbariManagementControlle
               }
               }
             }
             }
             widgetLayoutDAO.mergeWithFlush(existingLayoutEntity);
             widgetLayoutDAO.mergeWithFlush(existingLayoutEntity);
-            widgetLayoutDAO.refresh(existingLayoutEntity);
           }
           }
         }
         }
       }
       }

+ 1 - 0
ambari-server/src/main/java/org/apache/ambari/server/orm/dao/WidgetLayoutDAO.java

@@ -99,6 +99,7 @@ public class WidgetLayoutDAO {
     EntityManager entityManager = entityManagerProvider.get();
     EntityManager entityManager = entityManagerProvider.get();
     widgetLayoutEntity = entityManager.merge(widgetLayoutEntity);
     widgetLayoutEntity = entityManager.merge(widgetLayoutEntity);
     entityManager.flush();
     entityManager.flush();
+    entityManager.refresh(widgetLayoutEntity);
     return widgetLayoutEntity;
     return widgetLayoutEntity;
   }
   }