Author: sebb
Date: Wed Mar 19 20:41:11 2008
New Revision: 639143
URL: http://svn.apache.org/viewvc?rev=639143&view=rev
Log:
Revert some accidental changes in r638603
Modified:
jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/XPathAssertion.java
Modified:
jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/XPathAssertion.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/XPathAssertion.java?rev=639143&r1=639142&r2=639143&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/XPathAssertion.java
(original)
+++
jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/XPathAssertion.java
Wed Mar 19 20:41:11 2008
@@ -95,28 +95,28 @@
isWhitespace(), isNamespace(),
isTolerant(), isQuiet(), showWarnings() , reportErrors(), isXML);
} catch (SAXException e) {
log.debug("Caught sax exception: " + e);
- result.setError(isXML);
+ result.setError(true);
result.setFailureMessage(new
StringBuffer("SAXException: ").append(e.getMessage()).toString());
return result;
} catch (IOException e) {
log.warn("Cannot parse result content", e);
- result.setError(isXML);
+ result.setError(true);
result.setFailureMessage(new StringBuffer("IOException:
").append(e.getMessage()).toString());
return result;
} catch (ParserConfigurationException e) {
log.warn("Cannot parse result content", e);
- result.setError(isXML);
+ result.setError(true);
result.setFailureMessage(new
StringBuffer("ParserConfigurationException: ").append(e.getMessage())
.toString());
return result;
} catch (TidyException e) {
- result.setError(isXML);
+ result.setError(true);
result.setFailureMessage(e.getMessage());
return result;
}
if (doc == null || doc.getDocumentElement() == null) {
- result.setError(isXML);
+ result.setError(true);
result.setFailureMessage("Document is null, probably
not parsable");
return result;
}
@@ -137,12 +137,12 @@
}
return result;
default:
- result.setFailure(isXML);
+ result.setFailure(true);
result.setFailureMessage("Cannot
understand: " + pathString);
return result;
}
} catch (TransformerException e) {
- result.setError(isXML);
+ result.setError(true);
result.setFailureMessage(
new StringBuffer("TransformerException:
")
.append(e.getMessage())
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
