root
/
jmeter
mirror of https://github.com/apache/jmeter.git
1
0
Fork 0
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Display correct filenames, when they are searched by IncludeController 

Bugzilla Id: 58600


git-svn-id: https://svn.apache.org/repos/asf/jmeter/trunk@1713865 13f79535-47bb-0310-9956-ffa450edef68

Former-commit-id: a26e197b4a
This commit is contained in:
Felix Schumacher 2015-11-11 15:05:48 +00:00
parent 1db70ff5df
commit ee92b89984
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/components/org/apache/jmeter/control/IncludeController.java
View File

@ -129,10 +129,11 @@ public class IncludeController extends GenericController implements ReplaceableC
if(!file.exists() && !file.isAbsolute()){
log.info("loadIncludedElements -failed for: "+absolutePath);
file = new File(FileServer.getFileServer().getBaseDir(), includePath);
log.info("loadIncludedElements -Attempting to read it from: "+absolutePath);
log.info("loadIncludedElements -Attempting to read it from: " + file.getAbsolutePath());
if(!file.exists()){
log.error("loadIncludedElements -failed for: "+absolutePath);
throw new IOException("loadIncludedElements -failed for: "+absolutePath);
log.error("loadIncludedElements -failed for: " + file.getAbsolutePath());
throw new IOException("loadIncludedElements -failed for: " + absolutePath +
" and " + file.getAbsolutePath());
}
}

1
xdocs/changes.xml
View File

@ -170,6 +170,7 @@ Summary
<h3>Controllers</h3>
<ul>
<li><bug>58600</bug>Display correct filenames, when they are searched by IncludeController</li>
</ul>
<h3>Listeners</h3>