jmeter-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fschumac...@apache.org
Subject svn commit: r1713865 - in /jmeter/trunk: src/components/org/apache/jmeter/control/IncludeController.java xdocs/changes.xml
Date Wed, 11 Nov 2015 15:05:49 GMT
Author: fschumacher
Date: Wed Nov 11 15:05:48 2015
New Revision: 1713865

URL: http://svn.apache.org/viewvc?rev=1713865&view=rev
Log:
Display correct filenames, when they are searched by IncludeController

Bugzilla Id: 58600

Modified:
    jmeter/trunk/src/components/org/apache/jmeter/control/IncludeController.java
    jmeter/trunk/xdocs/changes.xml

Modified: jmeter/trunk/src/components/org/apache/jmeter/control/IncludeController.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/control/IncludeController.java?rev=1713865&r1=1713864&r2=1713865&view=diff
==============================================================================
--- jmeter/trunk/src/components/org/apache/jmeter/control/IncludeController.java (original)
+++ jmeter/trunk/src/components/org/apache/jmeter/control/IncludeController.java Wed Nov 11
15:05:48 2015
@@ -129,10 +129,11 @@ public class IncludeController extends G
                 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());
                     }
                 }
                 

Modified: jmeter/trunk/xdocs/changes.xml
URL: http://svn.apache.org/viewvc/jmeter/trunk/xdocs/changes.xml?rev=1713865&r1=1713864&r2=1713865&view=diff
==============================================================================
--- jmeter/trunk/xdocs/changes.xml (original)
+++ jmeter/trunk/xdocs/changes.xml Wed Nov 11 15:05:48 2015
@@ -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>



Mime
View raw message