narayana/conversations-classic
3
2
Fork 0
Code Issues 3 Pull requests Actions Packages Projects Releases 4 Wiki Activity

more npe fixes

Browse source
This commit is contained in:
iNPUTmice 2014-06-25 17:54:00 +02:00
parent 5db04a37bd
commit 66bb5c9b51
2 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/eu/siacs/conversations/xml/Tag.java
View file

@ -56,10 +56,12 @@ public class Tag {
} }
public boolean isStart(String needle) { public boolean isStart(String needle) {
if (needle==null) return false;
return (this.type == START) && (needle.equals(this.name)); return (this.type == START) && (needle.equals(this.name));
} }
public boolean isEnd(String needle) { public boolean isEnd(String needle) {
if (needle==null) return false;
return (this.type == END) && (needle.equals(this.name)); return (this.type == END) && (needle.equals(this.name));
} }

5
src/eu/siacs/conversations/xml/XmlReader.java
View file

@ -89,13 +89,16 @@ public class XmlReader {
Element element = new Element(currentTag.getName()); Element element = new Element(currentTag.getName());
element.setAttributes(currentTag.getAttributes()); element.setAttributes(currentTag.getAttributes());
Tag nextTag = this.readTag(); Tag nextTag = this.readTag();
if (nextTag == null) {
throw new IOException("unterupted mid tag");
}
if(nextTag.isNo()) { if(nextTag.isNo()) {
element.setContent(nextTag.getName()); element.setContent(nextTag.getName());
nextTag = this.readTag(); nextTag = this.readTag();
}
if (nextTag == null) { if (nextTag == null) {
throw new IOException("unterupted mid tag"); throw new IOException("unterupted mid tag");
} }
}
while(!nextTag.isEnd(element.getName())) { while(!nextTag.isEnd(element.getName())) {
if (!nextTag.isNo()) { if (!nextTag.isNo()) {
Element child = this.readElement(nextTag); Element child = this.readElement(nextTag);