arduino/esp8266
1
0
Fork 0
mirror of https://github.com/esp8266/Arduino.git synced 2025-06-17 22:23:10 +03:00
Code Activity

Merge pull request #96 from gandrewstone/master

Browse Source 
Avoid null pointer exception during compilation (race condition).

http://code.google.com/p/arduino/issues/detail?id=950
This commit is contained in:
David A. Mellis
2012-06-11 06:36:28 -07:00
parent a363686a31 5e75bd4a97
commit 6d6f4424e4
3 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/processing/app/debug/Compiler.java
View File

@ -401,10 +401,8 @@ public class Compiler implements MessageConsumer {
boolean compiling = true; boolean compiling = true;
while (compiling) { while (compiling) {
try { try {
if (in.thread != null) in.join();
in.thread.join(); err.join();
if (err.thread != null)
err.thread.join();
result = process.waitFor(); result = process.waitFor();
//System.out.println("result is " + result); //System.out.println("result is " + result);
compiling = false; compiling = false;

11
app/src/processing/app/debug/MessageSiphon.java
View File

@ -85,8 +85,15 @@ public class MessageSiphon implements Runnable {
} }
} }
// Wait until the MessageSiphon thread is complete.
public void join() throws java.lang.InterruptedException {
// Grab a temp copy in case another thread nulls the "thread"
// member variable
Thread t = thread;
if (t != null) t.join();
}
public Thread getThread() { public Thread getThread() {
return thread; return thread;
} }
} }

6
app/src/processing/app/debug/Sizer.java
View File

@ -63,10 +63,8 @@ public class Sizer implements MessageConsumer {
while(running) { while(running) {
try { try {
if (in.thread != null) in.join();
in.thread.join(); err.join();
if (err.thread != null)
err.thread.join();
r = process.waitFor(); r = process.waitFor();
running = false; running = false;
} catch (InterruptedException intExc) { } } catch (InterruptedException intExc) { }