svn commit: r1785990 - in /jmeter/trunk: src/core/org/apache/jmeter/reporters/ResultCollector.java xdocs/changes.xml

[se...@apache.org]

Author: sebb
Date: Wed Mar  8 15:38:57 2017
New Revision: 1785990

URL: http://svn.apache.org/viewvc?rev=1785990&view=rev
Log:
ResultCollector does not ensure unique file name entries in files HashMap
Bugzilla Id: 60822

Modified:
    jmeter/trunk/src/core/org/apache/jmeter/reporters/ResultCollector.java
    jmeter/trunk/xdocs/changes.xml

Modified: jmeter/trunk/src/core/org/apache/jmeter/reporters/ResultCollector.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/reporters/ResultCollector.java?rev=1785990&r1=1785989&r2=1785990&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/reporters/ResultCollector.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/reporters/ResultCollector.java Wed Mar  8 15:38:57 2017
@@ -441,7 +441,9 @@ public class ResultCollector extends Abs
         if (filename == null || filename.length() == 0) {
             return null;
         }
+        log.debug("Getting file: {} in thread {}", filename, Thread.currentThread().getName());
         filename = FileServer.resolveBaseRelativeName(filename);
+        filename = new File(filename).getCanonicalPath(); // try to ensure uniqueness (Bug 60822)
         FileEntry fe = files.get(filename);
         PrintWriter writer = null;
         boolean trimmed = true;
@@ -468,12 +470,13 @@ public class ResultCollector extends Abs
             }
             writer = new PrintWriter(new OutputStreamWriter(new BufferedOutputStream(new FileOutputStream(filename,
                     trimmed)), SaveService.getFileEncoding(StandardCharsets.UTF_8.name())), SAVING_AUTOFLUSH);
-            log.debug("Opened file: {}", filename);
+            log.debug("Opened file: {} in thread {}", filename, Thread.currentThread().getName());
             files.put(filename, new FileEntry(writer, saveConfig));
         } else {
             writer = fe.pw;
         }
         if (!trimmed) {
+            log.debug("Writing header to file: {}", filename);
             writeFileStart(writer, saveConfig);
         }
         return writer;

Modified: jmeter/trunk/xdocs/changes.xml
URL: http://svn.apache.org/viewvc/jmeter/trunk/xdocs/changes.xml?rev=1785990&r1=1785989&r2=1785990&view=diff
==============================================================================
--- jmeter/trunk/xdocs/changes.xml [utf-8] (original)
+++ jmeter/trunk/xdocs/changes.xml [utf-8] Wed Mar  8 15:38:57 2017
@@ -191,6 +191,7 @@ This affects configuration and 3rd party
     <li><bug>60691</bug>View Results Tree : In Renderers (XPath, JSON Path Tester, RegExp Tester and CSS/JQuery Tester) lower panel is sometimes not visible as upper panel is too big and cannot be resized</li>
     <li><bug>60687</bug>Make GUI more responsive when it gets a lot of events.</li>
     <li><bug>60791</bug>View Results Tree: Trigger search on Enter key in Search Feature and display red background if no match</li>
+    <li><bug>60822</bug>ResultCollector does not ensure unique file name entries in files HashMap</li>
 </ul>
 
 <h3>Timers, Assertions, Config, Pre- &amp; Post-Processors</h3>