You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by br...@apache.org on 2012/09/24 20:38:34 UTC
[3/11] android commit: Fix NPE on reset with undefined
NetworkListener.
Fix NPE on reset with undefined NetworkListener.
Project: http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/commit/2cd3ebc7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/tree/2cd3ebc7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/diff/2cd3ebc7
Branch: refs/heads/master
Commit: 2cd3ebc7a8db1cb883253796fed52cf39d9635b2
Parents: 7e3af6c
Author: Braden Shepherdson <br...@chromium.org>
Authored: Mon Sep 24 14:36:29 2012 -0400
Committer: Braden Shepherdson <br...@chromium.org>
Committed: Mon Sep 24 14:36:29 2012 -0400
----------------------------------------------------------------------
framework/src/org/apache/cordova/GeoBroker.java | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/blob/2cd3ebc7/framework/src/org/apache/cordova/GeoBroker.java
----------------------------------------------------------------------
diff --git a/framework/src/org/apache/cordova/GeoBroker.java b/framework/src/org/apache/cordova/GeoBroker.java
index 5b0714c..e6798a9 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;
+ }
}
/**