sebb 2004/04/13 11:31:56
Modified: src/protocol/http/org/apache/jmeter/protocol/http/sampler
Tag: rel-2_0 HTTPSampler.java HTTPSampler2.java
src/components/org/apache/jmeter/visualizers Tag: rel-2_0
ViewResultsFullVisualizer.java
Log:
See bugzilla 28230 - reorder string compare to allow for null data type
Revision Changes Path
No revision
No revision
1.91.2.2 +3 -3
jakarta-jmeter/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSampler.java
Index: HTTPSampler.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSampler.java,v
retrieving revision 1.91.2.1
retrieving revision 1.91.2.2
diff -u -r1.91.2.1 -r1.91.2.2
--- HTTPSampler.java 3 Apr 2004 20:32:40 -0000 1.91.2.1
+++ HTTPSampler.java 13 Apr 2004 18:31:56 -0000 1.91.2.2
@@ -561,7 +561,7 @@
}
if (isImageParser()
- && res.getDataType().equals(HTTPSampleResult.TEXT)
+ && (HTTPSampleResult.TEXT).equals(res.getDataType())
&& res.isSuccessful())
{
if (frameDepth > MAX_FRAME_DEPTH)
1.8.2.3 +3 -3
jakarta-jmeter/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSampler2.java
Index: HTTPSampler2.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSampler2.java,v
retrieving revision 1.8.2.2
retrieving revision 1.8.2.3
diff -u -r1.8.2.2 -r1.8.2.3
--- HTTPSampler2.java 13 Apr 2004 17:30:25 -0000 1.8.2.2
+++ HTTPSampler2.java 13 Apr 2004 18:31:56 -0000 1.8.2.3
@@ -544,7 +544,7 @@
}
if (isImageParser()
- && res.getDataType().equals(HTTPSampleResult.TEXT)
+ && (HTTPSampleResult.TEXT).equals(res.getDataType())
&& res.isSuccessful())
{
if (frameDepth > MAX_FRAME_DEPTH)
No revision
No revision
1.42.2.1 +3 -4
jakarta-jmeter/src/components/org/apache/jmeter/visualizers/ViewResultsFullVisualizer.java
Index: ViewResultsFullVisualizer.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/components/org/apache/jmeter/visualizers/ViewResultsFullVisualizer.java,v
retrieving revision 1.42
retrieving revision 1.42.2.1
diff -u -r1.42 -r1.42.2.1
--- ViewResultsFullVisualizer.java 15 Mar 2004 01:19:30 -0000 1.42
+++ ViewResultsFullVisualizer.java 13 Apr 2004 18:31:56 -0000 1.42.2.1
@@ -361,8 +361,7 @@
byte[] responseBytes = res.getResponseData();
String response = null;
- if (res.getDataType() != null
- && res.getDataType().equals(SampleResult.TEXT))
+ if ((SampleResult.TEXT).equals(res.getDataType()))
{
try
{
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
