[jmeter] branch master updated: Use correct path for tika-config.xml

[fschumacher]

This is an automated email from the ASF dual-hosted git repository.

fschumacher pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/jmeter.git


The following commit(s) were added to refs/heads/master by this push:
     new 84f54b6  Use correct path for tika-config.xml
84f54b6 is described below

commit 84f54b634c214ad521940eed3d7da4f8e49e5b4e
Author: Felix Schumacher <felix.schumac...@internetallee.de>
AuthorDate: Fri Jan 15 19:46:26 2021 +0100

    Use correct path for tika-config.xml
---
 .../apache/jmeter/protocol/http/gui/action/ParseCurlCommandAction.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git 
a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/gui/action/ParseCurlCommandAction.java
 
b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/gui/action/ParseCurlCommandAction.java
index c7a8fc7..7e42bc0 100644
--- 
a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/gui/action/ParseCurlCommandAction.java
+++ 
b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/gui/action/ParseCurlCommandAction.java
@@ -136,7 +136,8 @@ public class ParseCurlCommandAction extends AbstractAction 
implements MenuCreato
 
     private Tika createTika() {
         try {
-            return new Tika(new 
TikaConfig(this.getClass().getClassLoader().getResourceAsStream("tika-config.xml")));
+            return new Tika(new TikaConfig(this.getClass().getClassLoader()
+                    
.getResourceAsStream("org/apache/jmeter/protocol/http/gui/action/tika-config.xml")));
         } catch (TikaException | IOException | SAXException e) {
             return new Tika();
         }