Merge remote-tracking branch 'origin/master'

Evolveum · May 16, 2018 · 449e24d · 449e24d
2 parents 463c357 + 053df7e
commit 449e24d
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/util/NewWindowNotifyingBehavior.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/util/NewWindowNotifyingBehavior.java
@@ -21,6 +21,7 @@
 import org.apache.wicket.ajax.AjaxNewWindowNotifyingBehavior;
 import org.apache.wicket.ajax.AjaxRequestTarget;
 import org.apache.wicket.markup.html.WebPage;
+import org.apache.wicket.request.mapper.parameter.PageParameters;
 
 /**
  * Created by lazyman on 13/03/2017.
@@ -33,7 +34,11 @@ public class NewWindowNotifyingBehavior extends AjaxNewWindowNotifyingBehavior {
     protected void onNewWindow(AjaxRequestTarget target) {
         LOG.debug("Page version already used in different tab, refreshing page");
         WebPage page = (WebPage) getComponent();
-
-        page.setResponsePage(page.getPageClass(), page.getPageParameters());
+        //fix for MID-4649; windowName parameter causes recursive reloading of the page
+        PageParameters pageParameters = page.getPageParameters();
+        if (pageParameters != null && pageParameters.getPosition("windowName") > -1 ){
+            pageParameters = pageParameters.remove("windowName");
+        }
+        page.setResponsePage(page.getPageClass(), pageParameters);
     }
 }
diff --git a/...epo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/SqlRepositoryConfiguration.java b/...epo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/SqlRepositoryConfiguration.java
@@ -405,7 +405,7 @@ private static String getDefaultHibernateHbm2ddl(Database database) {
 
     private void computeDefaultConcurrencyParameters() {
         if (isUsingH2()) {
-            defaultTransactionIsolation = TransactionIsolation.READ_COMMITTED;
+            defaultTransactionIsolation = TransactionIsolation.SERIALIZABLE;
             defaultLockForUpdateViaHibernate = false;
             defaultLockForUpdateViaSql = false;
             defaultUseReadOnlyTransactions = false;        // h2 does not support "SET TRANSACTION READ ONLY" command