Fix NPE in namespace equals()

dolt131943 · Nov 18, 2014 · 29a2415 · 29a2415
1 parent cfedd67
commit 29a2415
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/src/main/java/net/dongliu/apk/parser/parser/XmlNamespaces.java b/src/main/java/net/dongliu/apk/parser/parser/XmlNamespaces.java
@@ -85,8 +85,10 @@ public boolean equals(Object o) {
 
             XmlNamespace namespace = (XmlNamespace) o;
 
-            if (!prefix.equals(namespace.prefix)) return false;
-            if (!uri.equals(namespace.uri)) return false;
+            if (prefix == null && namespace.prefix != null) return false;
+            if (uri == null && namespace.uri != null) return false;
+            if (prefix != null && !prefix.equals(namespace.prefix)) return false;
+            if (uri != null && !uri.equals(namespace.uri)) return false;
 
             return true;
         }