Fix Chrome RDP backend

This commit is contained in:
konsoletyper 2015-02-14 17:18:40 +04:00
parent f69e3310a3
commit 0cdf960ba5
2 changed files with 38 additions and 42 deletions

View File

@ -465,6 +465,7 @@ public class ChromeRDPDebugger implements JavaScriptDebugger, ChromeRDPExchangeC
for (PropertyDescriptorDTO property : properties) {
RemoteObjectDTO remoteValue = property.getValue();
RDPValue value;
if (remoteValue != null && remoteValue.getType() != null) {
switch (remoteValue.getType()) {
case "undefined":
value = new RDPValue(this, "undefined", "undefined", null, false);
@ -478,6 +479,9 @@ public class ChromeRDPDebugger implements JavaScriptDebugger, ChromeRDPExchangeC
remoteValue.getObjectId(), false);
break;
}
} else {
value = new RDPValue(this, "null", "null", "null", false);
}
RDPLocalVariable var = new RDPLocalVariable(property.getName(), value);
variables.add(var);

View File

@ -15,7 +15,6 @@
*/
package org.teavm.samples.async;
/**
*
* @author Alexey Andreev <konsoletyper@gmail.com>
@ -30,18 +29,13 @@ public final class AsyncProgram {
withAsync();
System.out.println();
final Object lock = new Object();
Thread t = new Thread(new Runnable(){
Thread t = new Thread(new Runnable() {
@Override
public void run() {
try {
doRun(lock);
} catch (InterruptedException ex){
} catch (InterruptedException ex) {
System.out.println(ex.getMessage());
}
}
@ -49,20 +43,19 @@ public final class AsyncProgram {
}, "Test Thread");
t.start();
Thread t2 = new Thread(new Runnable(){
Thread t2 = new Thread(new Runnable() {
@Override
public void run() {
try {
doRun(lock);
} catch (InterruptedException ex){
} catch (InterruptedException ex) {
System.out.println(ex.getMessage());
}
}
}, "Test Thread 2");
t2.start();
System.out.println("Should be main -> Current thread is "+Thread.currentThread().getName());
System.out.println("Should be main -> Current thread is " + Thread.currentThread().getName());
System.out.println("Now trying wait...");
lock.wait(20000);
@ -71,22 +64,22 @@ public final class AsyncProgram {
}
private static void doRun(Object lock) throws InterruptedException {
System.out.println("Current thread is "+Thread.currentThread().getName());
System.out.println("Current thread is " + Thread.currentThread().getName());
System.out.println("Executing timer task");
Thread.sleep(2000);
System.out.println("Current thread is "+Thread.currentThread().getName());
System.out.println("Current thread is " + Thread.currentThread().getName());
System.out.println("Calling lock.notify()");
lock.notify();
System.out.println("Current thread is "+Thread.currentThread().getName());
System.out.println("Current thread is " + Thread.currentThread().getName());
System.out.println("Finished calling lock.notify()");
Thread.sleep(5000);
System.out.println("Current thread is "+Thread.currentThread().getName());
System.out.println("Current thread is " + Thread.currentThread().getName());
System.out.println("Finished another 5 second sleep");
synchronized(lock){
System.out.println("Inside locked section of thread "+Thread.currentThread().getName());
synchronized (lock) {
System.out.println("Inside locked section of thread " + Thread.currentThread().getName());
Thread.sleep(2000);
System.out.println("Finished locked section of thread "+Thread.currentThread().getName());
System.out.println("Finished locked section of thread " + Thread.currentThread().getName());
}
}
@ -134,5 +127,4 @@ public final class AsyncProgram {
throw new IllegalStateException();
}
}