[MediaWiki-commits] [Gerrit] Prevent NPE in ToCHandler.scrollToSection - change (apps...wikipedia)

2014-12-03 Thread Dbrant (Code Review)
Dbrant has submitted this change and it was merged.

Change subject: Prevent NPE in ToCHandler.scrollToSection
..


Prevent NPE in ToCHandler.scrollToSection

Bug: T75402
Change-Id: I468d8ade39170c069073491ac85f8165622a4223
---
M wikipedia/src/main/java/org/wikipedia/page/ToCHandler.java
1 file changed, 3 insertions(+), 1 deletion(-)

Approvals:
  Dbrant: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/wikipedia/src/main/java/org/wikipedia/page/ToCHandler.java 
b/wikipedia/src/main/java/org/wikipedia/page/ToCHandler.java
index f96535b..9044900 100644
--- a/wikipedia/src/main/java/org/wikipedia/page/ToCHandler.java
+++ b/wikipedia/src/main/java/org/wikipedia/page/ToCHandler.java
@@ -151,7 +151,9 @@
 }
 
 public void scrollToSection(Section section) {
-scrollToSection(section.isLead() ? heading_ + section.getId() : 
section.getAnchor());
+if (section != null) {
+scrollToSection(section.isLead() ? heading_ + section.getId() : 
section.getAnchor());
+}
 }
 
 public void setupToC(final Page page) {

-- 
To view, visit https://gerrit.wikimedia.org/r/177148
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I468d8ade39170c069073491ac85f8165622a4223
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: BearND bsitzm...@wikimedia.org
Gerrit-Reviewer: Brion VIBBER br...@wikimedia.org
Gerrit-Reviewer: Dbrant dbr...@wikimedia.org
Gerrit-Reviewer: jenkins-bot 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits


[MediaWiki-commits] [Gerrit] Prevent NPE in ToCHandler.scrollToSection - change (apps...wikipedia)

2014-12-02 Thread BearND (Code Review)
BearND has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/177148

Change subject: Prevent NPE in ToCHandler.scrollToSection
..

Prevent NPE in ToCHandler.scrollToSection

Bug: T75402
Change-Id: I468d8ade39170c069073491ac85f8165622a4223
---
M wikipedia/src/main/java/org/wikipedia/page/ToCHandler.java
1 file changed, 3 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia 
refs/changes/48/177148/1

diff --git a/wikipedia/src/main/java/org/wikipedia/page/ToCHandler.java 
b/wikipedia/src/main/java/org/wikipedia/page/ToCHandler.java
index f96535b..9044900 100644
--- a/wikipedia/src/main/java/org/wikipedia/page/ToCHandler.java
+++ b/wikipedia/src/main/java/org/wikipedia/page/ToCHandler.java
@@ -151,7 +151,9 @@
 }
 
 public void scrollToSection(Section section) {
-scrollToSection(section.isLead() ? heading_ + section.getId() : 
section.getAnchor());
+if (section != null) {
+scrollToSection(section.isLead() ? heading_ + section.getId() : 
section.getAnchor());
+}
 }
 
 public void setupToC(final Page page) {

-- 
To view, visit https://gerrit.wikimedia.org/r/177148
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I468d8ade39170c069073491ac85f8165622a4223
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: BearND bsitzm...@wikimedia.org

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits