sebb        2005/07/03 16:00:50

  Modified:    src/core/org/apache/jmeter/save/converters
                        SampleResultConverter.java
  Log:
  Pass context to all methods in case needed later
  
  Revision  Changes    Path
  1.8       +13 -13    
jakarta-jmeter/src/core/org/apache/jmeter/save/converters/SampleResultConverter.java
  
  Index: SampleResultConverter.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/save/converters/SampleResultConverter.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- SampleResultConverter.java        5 Jun 2005 00:11:56 -0000       1.7
  +++ SampleResultConverter.java        3 Jul 2005 23:00:50 -0000       1.8
  @@ -75,13 +75,13 @@
      {
         SampleResult res = (SampleResult) obj;
         SampleSaveConfiguration save = res.getSaveConfig();
  -      setAttributes(writer, res, save);
  +      setAttributes(writer, context, res, save);
         saveAssertions(writer, context, res, save);
         saveSubResults(writer, context, res, save);
  -      saveResponseHeaders(writer, res, save);
  -      saveRequestHeaders(writer, res, save);
  -      saveResponseData(writer, res, save);
  -      saveSamplerData(writer, res, save);
  +      saveResponseHeaders(writer, context, res, save);
  +      saveRequestHeaders(writer, context, res, save);
  +      saveResponseData(writer, context, res, save);
  +      saveSamplerData(writer, context, res, save);
      }
   
      /**
  @@ -90,7 +90,7 @@
       * @param save
       */
      protected void saveSamplerData(HierarchicalStreamWriter writer,
  -         SampleResult res, SampleSaveConfiguration save)
  +         MarshallingContext context, SampleResult res, 
SampleSaveConfiguration save)
      {
         if (save.saveSamplerData(res))
         {
  @@ -104,7 +104,7 @@
       * @param save
       */
      protected void saveResponseData(HierarchicalStreamWriter writer,
  -         SampleResult res, SampleSaveConfiguration save)
  +         MarshallingContext context, SampleResult res, 
SampleSaveConfiguration save)
      {
         if (save.saveResponseData(res))
         {
  @@ -130,7 +130,7 @@
       * @param save
       */
      protected void saveRequestHeaders(HierarchicalStreamWriter writer,
  -         SampleResult res, SampleSaveConfiguration save)
  +         MarshallingContext context, SampleResult res, 
SampleSaveConfiguration save)
      {
         if (save.saveRequestHeaders())
         {
  @@ -144,7 +144,7 @@
       * @param save
       */
      protected void saveResponseHeaders(HierarchicalStreamWriter writer,
  -         SampleResult res, SampleSaveConfiguration save)
  +         MarshallingContext context, SampleResult res, 
SampleSaveConfiguration save)
      {
         if (save.saveResponseHeaders())
         {
  @@ -199,7 +199,7 @@
       * @param save
       */
      protected void setAttributes(HierarchicalStreamWriter writer,
  -         SampleResult res, SampleSaveConfiguration save)
  +         MarshallingContext context, SampleResult res, 
SampleSaveConfiguration save)
      {
         if (save.saveTime())
               writer.addAttribute("t", Long.toString(res.getTime()));
  @@ -256,7 +256,7 @@
      {
         SampleResult res = (SampleResult) createCollection(context
               .getRequiredType());
  -      retrieveAttributes(reader, res);
  +      retrieveAttributes(reader, context, res);
         while (reader.hasMoreChildren())
         {
            reader.moveDown();
  @@ -320,7 +320,7 @@
       * @param res
       */
      protected void retrieveAttributes(HierarchicalStreamReader reader,
  -         SampleResult res)
  +         UnmarshallingContext context, SampleResult res)
      {
         res.setSampleLabel(ConversionHelp.decode(reader.getAttribute("lb")));
         res.setDataEncoding(ConversionHelp.decode(reader.getAttribute("de")));
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to