midsuit
/
core-jgi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge release-7.1 into master

This commit is contained in:
hengsin 2020-02-04 11:00:07 +08:00
parent 8dec4fb537 a64ccd107e
commit 3dd7349c99
2 changed files with 17 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
org.adempiere.server-feature/pom.xml
View File

@ -117,7 +117,7 @@
<version>1.0.1</version> <version>1.0.1</version>
</artifactItem> </artifactItem>
<artifactItem> <artifactItem>
<groupId>woodstox</groupId> <groupId>org.codehaus.woodstox</groupId>
<artifactId>wstx-asl</artifactId> <artifactId>wstx-asl</artifactId>
<version>3.2.7</version> <version>3.2.7</version>
</artifactItem> </artifactItem>

34
org.adempiere.ui.zk/WEB-INF/src/fi/jawsy/jawwa/zk/atmosphere/AtmosphereServerPush.java
View File

@ -191,19 +191,23 @@ public class AtmosphereServerPush implements ServerPush {
log.error(e.getMessage(), e); log.error(e.getMessage(), e);
} }
if (!ok) { if (!ok) {
try { for(int i = 0; i < 3 && !ok; i++) {
Thread.sleep(500);
} catch (InterruptedException e1) {}
if (schedules.size() > 0) {
try { try {
ok = commitResponse(); Thread.sleep(500);
} catch (IOException e) { } catch (InterruptedException e1) {}
log.error(e.getMessage(), e); if (schedules.size() > 0) {
} try {
if (!ok) { ok = commitResponse();
log.warn("Failed to resume long polling resource"); } catch (IOException e) {
} log.error(e.getMessage(), e);
} }
} else {
ok = true;
}
}
if (!ok) {
log.warn("Failed to resume long polling resource");
}
} }
} else { } else {
//in event listener thread, can schedule immediately //in event listener thread, can schedule immediately
@ -252,12 +256,6 @@ public class AtmosphereServerPush implements ServerPush {
log.trace(resource.transport().name()); log.trace(resource.transport().name());
} }
try {
commitResponse();
} catch (IOException e) {
log.error(e.getLocalizedMessage(), e);
}
DesktopCtrl desktopCtrl = (DesktopCtrl) this.desktop.get(); DesktopCtrl desktopCtrl = (DesktopCtrl) this.desktop.get();
if (desktopCtrl == null) { if (desktopCtrl == null) {
log.error("No desktop available"); log.error("No desktop available");