diff --git a/ccm-core/src/com/arsdigita/ui/admin/applications/ApplicationInstancePane.java b/ccm-core/src/com/arsdigita/ui/admin/applications/ApplicationInstancePane.java index c0d9ff68c..e978609a8 100644 --- a/ccm-core/src/com/arsdigita/ui/admin/applications/ApplicationInstancePane.java +++ b/ccm-core/src/com/arsdigita/ui/admin/applications/ApplicationInstancePane.java @@ -21,6 +21,7 @@ package com.arsdigita.ui.admin.applications; import com.arsdigita.bebop.Label; import com.arsdigita.bebop.PropertySheet; import com.arsdigita.bebop.SegmentedPanel; +import com.arsdigita.persistence.SessionManager; import com.arsdigita.ui.admin.GlobalizationUtil; import com.arsdigita.web.Application; @@ -37,7 +38,7 @@ public class ApplicationInstancePane extends SegmentedPanel { public ApplicationInstancePane(final Application appInstance, final ApplicationInstanceAwareContainer appAdminPane) { super(); - + final PropertySheet appInstInfoPanel = new PropertySheet(new ApplicationInstancePropertySheetModelBuilder( appInstance)); @@ -57,6 +58,10 @@ public class ApplicationInstancePane extends SegmentedPanel { "ui.admin.applications.ApplicationInstancePane.manage.heading")), appAdminPane); } + + if (SessionManager.getSession().getTransactionContext().inTxn()) { + SessionManager.getSession().getTransactionContext().commitTxn(); + } } } diff --git a/ccm-core/src/com/arsdigita/ui/admin/applications/MultiInstanceApplicationPane.java b/ccm-core/src/com/arsdigita/ui/admin/applications/MultiInstanceApplicationPane.java index 6b8d84d1e..a53459aec 100644 --- a/ccm-core/src/com/arsdigita/ui/admin/applications/MultiInstanceApplicationPane.java +++ b/ccm-core/src/com/arsdigita/ui/admin/applications/MultiInstanceApplicationPane.java @@ -25,6 +25,7 @@ import com.arsdigita.bebop.Table; import com.arsdigita.bebop.table.TableColumn; import com.arsdigita.bebop.table.TableModel; import com.arsdigita.bebop.table.TableModelBuilder; +import com.arsdigita.persistence.SessionManager; import com.arsdigita.ui.admin.GlobalizationUtil; import com.arsdigita.util.LockableImpl; import com.arsdigita.web.Application; @@ -133,6 +134,9 @@ public class MultiInstanceApplicationPane extends BaseApp } public Object getKeyAt(final int columnIndex) { + if (SessionManager.getSession().getTransactionContext().inTxn()) { + SessionManager.getSession().getTransactionContext().commitTxn(); + } return applications.getApplication().getPath(); }