[jena] branch master updated: JENA-1775: Protect against a bad resource name

[andy]

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

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


The following commit(s) were added to refs/heads/master by this push:
     new 5c31d7d  JENA-1775: Protect against a bad resource name
     new 6c72fe7  Merge pull request #626 from afs/JENA-1775_bad-resource-name
5c31d7d is described below

commit 5c31d7d55e4c80e40cce8805638011c915f080c6
Author: Andy Seaborne <a...@apache.org>
AuthorDate: Tue Oct 29 16:18:48 2019 +0000

    JENA-1775: Protect against a bad resource name
---
 .../apache/jena/riot/system/stream/LocatorClassLoader.java   |  3 ++-
 .../main/java/org/apache/jena/util/LocatorClassLoader.java   | 12 ++----------
 2 files changed, 4 insertions(+), 11 deletions(-)

diff --git 
a/jena-arq/src/main/java/org/apache/jena/riot/system/stream/LocatorClassLoader.java
 
b/jena-arq/src/main/java/org/apache/jena/riot/system/stream/LocatorClassLoader.java
index 9b0dc1c..4c458d6 100644
--- 
a/jena-arq/src/main/java/org/apache/jena/riot/system/stream/LocatorClassLoader.java
+++ 
b/jena-arq/src/main/java/org/apache/jena/riot/system/stream/LocatorClassLoader.java
@@ -58,7 +58,8 @@ public class LocatorClassLoader  implements Locator
         if ( classLoader == null )
             return null ;
             
-        InputStream in = classLoader.getResourceAsStream(resourceName) ;
+        InputStream in = null;
+        try { in = classLoader.getResourceAsStream(resourceName) ; } catch 
(Exception ex) {}
         if ( in == null )
         {
             if ( StreamManager.logAllLookups && log.isTraceEnabled() )
diff --git 
a/jena-core/src/main/java/org/apache/jena/util/LocatorClassLoader.java 
b/jena-core/src/main/java/org/apache/jena/util/LocatorClassLoader.java
index 289e6eb..e168f0c 100644
--- a/jena-core/src/main/java/org/apache/jena/util/LocatorClassLoader.java
+++ b/jena-core/src/main/java/org/apache/jena/util/LocatorClassLoader.java
@@ -22,8 +22,6 @@ import java.io.InputStream;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-
-
 public class LocatorClassLoader  implements Locator
 {
     static Logger log = LoggerFactory.getLogger(LocatorClassLoader.class) ;
@@ -53,14 +51,8 @@ public class LocatorClassLoader  implements Locator
             return null ;
             
         String fn = filenameOrURI ;
-//        String fn = FileUtils.toFilename(filenameOrURI) ;
-//        if ( fn == null )
-//        {
-//            if ( FileManager.logAllLookups && log.isTraceEnabled() )
-//                log.trace("Not found: "+filenameOrURI) ; 
-//            return null ;
-//        }
-        InputStream in = classLoader.getResourceAsStream(fn) ;
+        InputStream in = null;
+        try { in = classLoader.getResourceAsStream(fn) ; } catch (Exception 
ex) {}
         if ( in == null )
         {
             if ( FileManager.logAllLookups && log.isTraceEnabled() )