LPS-66705 SF - ensure we reset the previous value

jonathanmccann · Aug 24, 2016 · 9010bf7 · 9010bf7
1 parent a5cb169
commit 9010bf7
Showing 1 changed file with 9 additions and 6 deletions.
diff --git a/...ervice/src/main/java/com/liferay/journal/service/impl/JournalArticleLocalServiceImpl.java b/...ervice/src/main/java/com/liferay/journal/service/impl/JournalArticleLocalServiceImpl.java
@@ -7728,13 +7728,16 @@ protected void updateDDMStructurePredefinedValues(
 
 		boolean indexingEnabled = serviceContext.isIndexingEnabled();
 
-		serviceContext.setIndexingEnabled(false);
-
-		ddmStructureLocalService.updateStructure(
-			serviceContext.getUserId(), ddmStructureId, ddmForm,
-			ddmStructure.getDDMFormLayout(), serviceContext);
+		try {
+			serviceContext.setIndexingEnabled(false);
 
-		serviceContext.setIndexingEnabled(indexingEnabled);
+			ddmStructureLocalService.updateStructure(
+				serviceContext.getUserId(), ddmStructureId, ddmForm,
+				ddmStructure.getDDMFormLayout(), serviceContext);
+		}
+		finally {
+			serviceContext.setIndexingEnabled(indexingEnabled);
+		}
 	}
 
 	protected void updatePreviousApprovedArticle(JournalArticle article)