From 2cd3ebc7a8db1cb883253796fed52cf39d9635b2 Mon Sep 17 00:00:00 2001 From: Braden Shepherdson Date: Mon, 24 Sep 2012 14:36:29 -0400 Subject: [PATCH] Fix NPE on reset with undefined NetworkListener. --- framework/src/org/apache/cordova/GeoBroker.java | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/framework/src/org/apache/cordova/GeoBroker.java b/framework/src/org/apache/cordova/GeoBroker.java index 5b0714cd..e6798a99 100755 --- a/framework/src/org/apache/cordova/GeoBroker.java +++ b/framework/src/org/apache/cordova/GeoBroker.java @@ -135,10 +135,14 @@ public class GeoBroker extends Plugin { * Stop listener. */ public void onDestroy() { - this.networkListener.destroy(); - this.gpsListener.destroy(); - this.networkListener = null; - this.gpsListener = null; + if (this.networkListener != null) { + this.networkListener.destroy(); + this.networkListener = null; + } + if (this.gpsListener != null) { + this.gpsListener.destroy(); + this.gpsListener = null; + } } /**