From 79eb32f816daf52a959d6af57dc0c95c4066c954 Mon Sep 17 00:00:00 2001
From: Federico Fissore <f.fissore@arduino.cc>
Date: Fri, 21 Feb 2014 11:14:30 +0100
Subject: [PATCH] Fixed NPE when RXCHAR event with no bytes. Closes #1885

---
 app/src/processing/app/Serial.java | 2 +-
 build/shared/revisions.txt         | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/app/src/processing/app/Serial.java b/app/src/processing/app/Serial.java
index a5d826896..b8acc4615 100644
--- a/app/src/processing/app/Serial.java
+++ b/app/src/processing/app/Serial.java
@@ -175,7 +175,7 @@ public class Serial implements SerialPortEventListener {
   public synchronized void serialEvent(SerialPortEvent serialEvent) {
     if (serialEvent.isRXCHAR()) {
       try {
-        byte[] buf = port.readBytes();
+        byte[] buf = port.readBytes(serialEvent.getEventValue());
         if (buf.length > 0) {
           if (bufferLast == buffer.length) {
             byte temp[] = new byte[bufferLast << 1];
diff --git a/build/shared/revisions.txt b/build/shared/revisions.txt
index 0ca8c1660..41e14b1db 100644
--- a/build/shared/revisions.txt
+++ b/build/shared/revisions.txt
@@ -1,4 +1,9 @@
 
+ARDUINO 1.5.6-r2 BETA 2014.02.21
+
+[ide]
+* JSSC: Fixed NPE when RXCHAR event with no bytes (José Pereda)
+
 ARDUINO 1.5.6 BETA 2014.02.20
 
 [ide]