Skip to content

Commit adf768d

Browse files
committed
Minor fixes and some new unit test cases.
1 parent 1dd2333 commit adf768d

File tree

3 files changed

+1594
-2
lines changed

3 files changed

+1594
-2
lines changed

library/src/main/java/com/digi/xbee/api/connection/DataReader.java

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -149,10 +149,15 @@ public void setXBeeReaderMode(OperatingMode mode) {
149149
* @param listener Listener to be notified when new XBee data packets are
150150
* received.
151151
*
152+
* @throws NullPointerException if {@code listener == null}.
153+
*
152154
* @see #removeDataReceiveListener(IDataReceiveListener)
153155
* @see com.digi.xbee.api.listeners.IDataReceiveListener
154156
*/
155157
public void addDataReceiveListener(IDataReceiveListener listener) {
158+
if (listener == null)
159+
throw new NullPointerException("Listener cannot be null.");
160+
156161
synchronized (dataReceiveListeners) {
157162
if (!dataReceiveListeners.contains(listener))
158163
dataReceiveListeners.add(listener);
@@ -186,6 +191,8 @@ public void removeDataReceiveListener(IDataReceiveListener listener) {
186191
*
187192
* @param listener Listener to be notified when any XBee packet is received.
188193
*
194+
* @throws NullPointerException if {@code listener == null}.
195+
*
189196
* @see #addPacketReceiveListener(IPacketReceiveListener, int)
190197
* @see #removePacketReceiveListener(IPacketReceiveListener)
191198
* @see com.digi.xbee.api.listeners.IPacketReceiveListener
@@ -207,11 +214,16 @@ public void addPacketReceiveListener(IPacketReceiveListener listener) {
207214
* Using {@link #ALL_FRAME_IDS} this listener will be
208215
* notified always and will be removed only by user request.
209216
*
217+
* @throws NullPointerException if {@code listener == null}.
218+
*
210219
* @see #addPacketReceiveListener(IPacketReceiveListener)
211220
* @see #removePacketReceiveListener(IPacketReceiveListener)
212221
* @see com.digi.xbee.api.listeners.IPacketReceiveListener
213222
*/
214223
public void addPacketReceiveListener(IPacketReceiveListener listener, int frameID) {
224+
if (listener == null)
225+
throw new NullPointerException("Listener cannot be null.");
226+
215227
synchronized (packetReceiveListeners) {
216228
if (!packetReceiveListeners.containsKey(listener))
217229
packetReceiveListeners.put(listener, frameID);
@@ -247,10 +259,15 @@ public void removePacketReceiveListener(IPacketReceiveListener listener) {
247259
* @param listener Listener to be notified when new IO sample packets are
248260
* received.
249261
*
262+
* @throws NullPointerException if {@code listener == null}.
263+
*
250264
* @see #removeIOSampleReceiveListener(IIOSampleReceiveListener)
251265
* @see com.digi.xbee.api.listeners.IIOSampleReceiveListener
252266
*/
253267
public void addIOSampleReceiveListener(IIOSampleReceiveListener listener) {
268+
if (listener == null)
269+
throw new NullPointerException("Listener cannot be null.");
270+
254271
synchronized (ioSampleReceiveListeners) {
255272
if (!ioSampleReceiveListeners.contains(listener))
256273
ioSampleReceiveListeners.add(listener);
@@ -285,10 +302,15 @@ public void removeIOSampleReceiveListener(IIOSampleReceiveListener listener) {
285302
* @param listener Listener to be notified when new modem status packets are
286303
* received.
287304
*
305+
* @throws NullPointerException if {@code listener == null}.
306+
*
288307
* @see #removeModemStatusReceiveListener(IModemStatusReceiveListener)
289308
* @see com.digi.xbee.api.listeners.IModemStatusReceiveListener
290309
*/
291310
public void addModemStatusReceiveListener(IModemStatusReceiveListener listener) {
311+
if (listener == null)
312+
throw new NullPointerException("Listener cannot be null.");
313+
292314
synchronized (modemStatusListeners) {
293315
if (!modemStatusListeners.contains(listener))
294316
modemStatusListeners.add(listener);
@@ -323,10 +345,15 @@ public void removeModemStatusReceiveListener(IModemStatusReceiveListener listene
323345
* @param listener Listener to be notified when new explicit data packets
324346
* are received.
325347
*
348+
* @throws NullPointerException if {@code listener == null}.
349+
*
326350
* @see #removeExplicitDataReceiveListener(IExplicitDataReceiveListener)
327351
* @see com.digi.xbee.api.listeners.IExplicitDataReceiveListener
328352
*/
329353
public void addExplicitDataReceiveListener(IExplicitDataReceiveListener listener) {
354+
if (listener == null)
355+
throw new NullPointerException("Listener cannot be null.");
356+
330357
synchronized (explicitDataReceiveListeners) {
331358
if (!explicitDataReceiveListeners.contains(listener))
332359
explicitDataReceiveListeners.add(listener);

0 commit comments

Comments
 (0)