Merge pull request #378 from MariaKober/develop

Fixed bug in XML read-in: reading in more than one source for a sink.

Author: StevenArzt

Diff for: soot-infoflow/src/soot/jimple/infoflow/results/xml/InfoflowResultsReader.java

@@ -85,6 +85,7 @@ public SerializedInfoflowResults readResults(String fileName) throws XMLStreamEx
 
 					// Read the attributes
 					statement = getAttributeByName(reader, XmlConstants.Attributes.statement);
+					method = getAttributeByName(reader, XmlConstants.Attributes.method);
 				} else if (reader.getLocalName().equals(XmlConstants.Tags.accessPath) && reader.isStartElement()) {
 					stateStack.push(State.accessPath);
 
@@ -175,18 +176,18 @@ public SerializedInfoflowResults readResults(String fileName) throws XMLStreamEx
 				} else if (reader.isEndElement()) {
 					stateStack.pop();
 
-					if (reader.getLocalName().equals(XmlConstants.Tags.accessPath))
+					if (reader.getLocalName().equals(XmlConstants.Tags.accessPath)) {
 						ap = new SerializedAccessPath(apValue, apValueType, apTaintSubFields,
 								apFields.toArray(new String[apFields.size()]),
 								apTypes.toArray(new String[apTypes.size()]));
-					else if (reader.getLocalName().equals(XmlConstants.Tags.sink))
+					} else if (reader.getLocalName().equals(XmlConstants.Tags.sink)) {
 						sink = new SerializedSinkInfo(ap, statement, method);
-					else if (reader.getLocalName().equals(XmlConstants.Tags.source))
+					} else if (reader.getLocalName().equals(XmlConstants.Tags.source)) {
 						source = new SerializedSourceInfo(ap, statement, method, pathElements);
-					else if (reader.getLocalName().equals(XmlConstants.Tags.result))
 						results.addResult(source, sink);
-					else if (reader.getLocalName().equals(XmlConstants.Tags.pathElement))
+					} else if (reader.getLocalName().equals(XmlConstants.Tags.pathElement)) {
 						pathElements.add(new SerializedPathElement(ap, statement, method));
+					}
 				}
 			}