Skip to content

Commit d53f071

Browse files
authored
fix: readAndWriteOutsideSessionLock set always false (#261)
Special error handling of Liferay portlet is not compatible with readAndWriteOutsideSessionLock=true introduced in Flow 23.6.3. See #213.
1 parent 07e2ceb commit d53f071

3 files changed

Lines changed: 11 additions & 5 deletions

File tree

pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -73,9 +73,9 @@
7373
<maven.resources.plugin.version>3.0.2</maven.resources.plugin.version>
7474
<maven.clean.plugin.version>3.0.0</maven.clean.plugin.version>
7575

76-
<testbench.version>8.1.0</testbench.version>
77-
<vaadin.version>23.3-SNAPSHOT</vaadin.version>
78-
<flow.version>23.3-SNAPSHOT</flow.version>
76+
<testbench.version>8.3.0</testbench.version>
77+
<vaadin.version>23.6-SNAPSHOT</vaadin.version>
78+
<flow.version>23.6-SNAPSHOT</flow.version>
7979
<flow.cdi.version>14.0-SNAPSHOT</flow.cdi.version>
8080
<jetty.version>10.0.9</jetty.version>
8181
<webdrivermanager.version>5.2.3</webdrivermanager.version>

vaadin-portlet-liferay-integration-tests/liferay-tests-generic/src/test/java/com/vaadin/flow/portal/liferay/streamresource/LiferayStreamResourceIT.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
*/
99
package com.vaadin.flow.portal.liferay.streamresource;
1010

11+
import java.time.Duration;
1112
import java.util.Map;
12-
import java.util.concurrent.TimeUnit;
1313

1414
import net.jcip.annotations.NotThreadSafe;
1515
import org.junit.Assert;
@@ -27,7 +27,7 @@ public void downloadStreamResource_responseHeadersAreSent() {
2727
AnchorElement link = getVaadinPortletRootElement()
2828
.$(AnchorElement.class).id("downloadLink");
2929
String url = link.getAttribute("href");
30-
getDriver().manage().timeouts().setScriptTimeout(15, TimeUnit.SECONDS);
30+
getDriver().manage().timeouts().scriptTimeout(Duration.ofSeconds(15));
3131

3232
Map<String, String> headers = downloadAndGetResponseHeaders(url);
3333

vaadin-portlet/src/main/java/com/vaadin/flow/portal/PortletUidlRequestHandler.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,12 @@ public boolean synchronizedHandleRequest(VaadinSession session, VaadinRequest re
4141
return super.synchronizedHandleRequest(session, request, vaadinResponseWrapper);
4242
}
4343

44+
@Override
45+
public boolean isReadAndWriteOutsideSessionLock() {
46+
// special VaadinResponseWrapper is not compatible with returning true.
47+
return false;
48+
}
49+
4450
/**
4551
* Wraps the portlet response to stub the writing actions so as to not
4652
* write the UIDL sync message, when the error occurs during RPC handling.

0 commit comments

Comments
 (0)