This is an automated email from the ASF dual-hosted git repository.
jtulach pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans-html4j.git
The following commit(s) were added to refs/heads/master by this push:
new 95ec7bd WebSocket implementation is broken on GraalVM EE 19.1.0
because of JDK-8222912
95ec7bd is described below
commit 95ec7bdd5acdde6c3d3c353769ddbc9e15acbdd1
Author: Jaroslav Tulach <[email protected]>
AuthorDate: Wed Jul 10 11:21:45 2019 +0200
WebSocket implementation is broken on GraalVM EE 19.1.0 because of
JDK-8222912
---
ko4j/src/main/java/org/netbeans/html/ko4j/KOSockets.java | 2 +-
.../test/java/org/netbeans/html/ko4j/KnockoutFXTest.java | 13 ++++++++++++-
2 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/ko4j/src/main/java/org/netbeans/html/ko4j/KOSockets.java
b/ko4j/src/main/java/org/netbeans/html/ko4j/KOSockets.java
index 749dda0..af8848f 100644
--- a/ko4j/src/main/java/org/netbeans/html/ko4j/KOSockets.java
+++ b/ko4j/src/main/java/org/netbeans/html/ko4j/KOSockets.java
@@ -50,7 +50,7 @@ implements WSTransfer<LoadWS> {
socket.close();
}
- @JavaScriptBody(args = {}, body = "if (window['WebSocket']) return true;
else return false;")
+ @JavaScriptBody(args = {}, body = "if (typeof window === 'object' &&
window['WebSocket']) return true; else return false;")
static final boolean areWebSocketsSupported() {
return false;
}
diff --git a/ko4j/src/test/java/org/netbeans/html/ko4j/KnockoutFXTest.java
b/ko4j/src/test/java/org/netbeans/html/ko4j/KnockoutFXTest.java
index 93979b7..e1b4204 100644
--- a/ko4j/src/test/java/org/netbeans/html/ko4j/KnockoutFXTest.java
+++ b/ko4j/src/test/java/org/netbeans/html/ko4j/KnockoutFXTest.java
@@ -101,18 +101,29 @@ public final class KnockoutFXTest extends KnockoutTCK {
asSubclass(Annotation.class);
for (Method m : c.getMethods()) {
if (m.getAnnotation(koTest) != null) {
+ if (skipUnsupported(m)) {
+ continue;
+ }
res.add(new KOFx(browserContext, m));
}
}
}
+ private static boolean skipUnsupported(Method m) {
+ String version = System.getProperty("java.version"); // NOI18N
+ if ("1.8.0_212".equals(version) &&
"connectUsingWebSocket".equals(m.getName())) { // NOI18N
+ return true;
+ }
+ return false;
+ }
+
static synchronized ClassLoader getClassLoader() throws
InterruptedException {
while (browserClass == null) {
KnockoutFXTest.class.wait();
}
return browserClass.getClassLoader();
}
-
+
public static synchronized void initialized(Class<?> browserCls) throws
Exception {
browserClass = browserCls;
browserContext = Fn.activePresenter();
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
