You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by pa...@apache.org on 2019/05/07 14:07:57 UTC

svn commit: r1858861 - /felix/trunk/connect/src/main/java/org/apache/felix/connect/JarRevision.java

Author: pauls
Date: Tue May  7 14:07:57 2019
New Revision: 1858861

URL: http://svn.apache.org/viewvc?rev=1858861&view=rev
Log:
FELIX-6126: Make jar url getPath work with plain path entires in Felix Connect

Modified:
    felix/trunk/connect/src/main/java/org/apache/felix/connect/JarRevision.java

Modified: felix/trunk/connect/src/main/java/org/apache/felix/connect/JarRevision.java
URL: http://svn.apache.org/viewvc/felix/trunk/connect/src/main/java/org/apache/felix/connect/JarRevision.java?rev=1858861&r1=1858860&r2=1858861&view=diff
==============================================================================
--- felix/trunk/connect/src/main/java/org/apache/felix/connect/JarRevision.java (original)
+++ felix/trunk/connect/src/main/java/org/apache/felix/connect/JarRevision.java Tue May  7 14:07:57 2019
@@ -63,7 +63,7 @@ class JarRevision implements Revision
     }
 
     @Override
-    public URL getEntry(String entryName)
+    public URL getEntry(final String entryName)
     {
         try
         {
@@ -83,13 +83,13 @@ class JarRevision implements Revision
                     } else {
                         newUrl = "jar:" + m_urlString + "!/" + ((m_prefix == null) ? "" : m_prefix) + target;
                     }
+
                     URL result = new URL(null, newUrl, new URLStreamHandler()
                     {
                         protected URLConnection openConnection(final URL u) throws IOException
                         {
-                            return new java.net.JarURLConnection(u)
+                            return new java.net.JarURLConnection(new URL(u.toExternalForm()))
                             {
-
                                 public JarFile getJarFile()
                                 {
                                     return m_jar;
@@ -101,24 +101,23 @@ class JarRevision implements Revision
 
                                 public InputStream getInputStream() throws IOException
                                 {
-                                    String extF = u.toExternalForm();
-                                    JarEntry targetEntry = entry;
-                                    if (!extF.endsWith(target))
-                                    {
-                                        extF = extF.substring(extF.indexOf('!') + 2);
-                                        if (m_prefix != null)
-                                        {
-                                            if (!extF.startsWith(m_prefix))
-                                            {
-                                                extF = m_prefix + extF;
-                                            }
-                                        }
-                                        targetEntry = m_jar.getJarEntry(extF);
-                                    }
-                                    return m_jar.getInputStream(targetEntry);
+
+                                    return getJarFile().getInputStream(getJarEntry());
                                 }
                             };
                         }
+
+                        @Override
+                        protected void setURL(URL u, String protocol, String host, int port, String authority, String userInfo, String path, String query, String ref)
+                        {
+                            super.setURL(u, protocol, path.contains("!/") ? path.substring(0, path.lastIndexOf("!/") + 1) : host, port, authority, userInfo, path.contains("!/") ? path.substring(path.lastIndexOf("!/") + 1) : path, query, ref);
+                        }
+
+                        @Override
+                        protected String toExternalForm(URL u)
+                        {
+                            return u.getHost() != null && u.getHost().contains("!") ? "jar:" + u.getHost() + u.getPath() : super.toExternalForm(u);
+                        }
                     });
                     return result;
                 }