You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jmeter.apache.org by pm...@apache.org on 2016/02/02 22:20:16 UTC

svn commit: r1728215 - /jmeter/trunk/src/core/org/apache/jmeter/report/processor/FieldSampleComparator.java

Author: pmouawad
Date: Tue Feb  2 21:20:16 2016
New Revision: 1728215

URL: http://svn.apache.org/viewvc?rev=1728215&view=rev
Log:
Bug 58884 - JMeter report generator : need better error message
#resolve #102
Bugzilla Id: 58884

Modified:
    jmeter/trunk/src/core/org/apache/jmeter/report/processor/FieldSampleComparator.java

Modified: jmeter/trunk/src/core/org/apache/jmeter/report/processor/FieldSampleComparator.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/report/processor/FieldSampleComparator.java?rev=1728215&r1=1728214&r2=1728215&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/report/processor/FieldSampleComparator.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/report/processor/FieldSampleComparator.java Tue Feb  2 21:20:16 2016
@@ -19,15 +19,13 @@ package org.apache.jmeter.report.process
 
 import org.apache.jmeter.report.core.Sample;
 import org.apache.jmeter.report.core.SampleComparator;
-import org.apache.jmeter.report.core.SampleException;
 import org.apache.jmeter.report.core.SampleMetadata;
 
 /**
  * @since 2.14
  */
 public class FieldSampleComparator implements SampleComparator {
-    private static final String METADATA_EXCEPTION_MSG_FMT = "No <%s> data found in sample metadata <%s>";
-
+    
     private int index;
 
     private final String fieldName;
@@ -38,11 +36,7 @@ public class FieldSampleComparator imple
 
     @Override
     public final void initialize(SampleMetadata metadata) {
-        index = metadata.indexOf(fieldName);
-        if (index < 0) {
-            throw new SampleException(String.format(METADATA_EXCEPTION_MSG_FMT,
-                    fieldName, metadata));
-        }
+        index = metadata.ensureIndexOf(fieldName);
     }
 
     /*
@@ -54,6 +48,6 @@ public class FieldSampleComparator imple
      */
     @Override
     public long compare(Sample s1, Sample s2) {
-        return Long.compare(s1.getLong(index), s2.getLong(index));
+        return Long.compare(s1.getData(long.class, index), s2.getData(long.class, index));
     }
 }