root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 8 Packages Projects Releases Wiki Activity

ResourceUtils isFileURL detects "vfsfile" as a file system protocol (again) 

Issue: SPR-11887
This commit is contained in:
Juergen Hoeller 2014-06-20 01:03:01 +02:00
parent dfc370c368
commit d801f9da89
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
spring-core/src/main/java/org/springframework/util/ResourceUtils.java
View File

@ -72,7 +72,10 @@ public abstract class ResourceUtils {
/** URL protocol for an entry from a JBoss jar file: "vfszip" */ /** URL protocol for an entry from a JBoss jar file: "vfszip" */
public static final String URL_PROTOCOL_VFSZIP = "vfszip"; public static final String URL_PROTOCOL_VFSZIP = "vfszip";
/** URL protocol for a JBoss VFS resource: "vfs" */ /** URL protocol for a JBoss file system resource: "vfsfile" */
public static final String URL_PROTOCOL_VFSFILE = "vfsfile";
/** URL protocol for a general JBoss VFS resource: "vfs" */
public static final String URL_PROTOCOL_VFS = "vfs"; public static final String URL_PROTOCOL_VFS = "vfs";
/** Separator between JAR URL and file path within the JAR */ /** Separator between JAR URL and file path within the JAR */
@ -248,27 +251,26 @@ public abstract class ResourceUtils {
/** /**
* Determine whether the given URL points to a resource in the file system, * Determine whether the given URL points to a resource in the file system,
* that is, has protocol "file" or "vfs". * that is, has protocol "file", "vfsfile" or "vfs".
* @param url the URL to check * @param url the URL to check
* @return whether the URL has been identified as a file system URL * @return whether the URL has been identified as a file system URL
*/ */
public static boolean isFileURL(URL url) { public static boolean isFileURL(URL url) {
String protocol = url.getProtocol(); String protocol = url.getProtocol();
return (URL_PROTOCOL_FILE.equals(protocol) || URL_PROTOCOL_VFS.equals(protocol)); return (URL_PROTOCOL_FILE.equals(protocol) || URL_PROTOCOL_VFSFILE.equals(protocol) ||
URL_PROTOCOL_VFS.equals(protocol));
} }
/** /**
* Determine whether the given URL points to a resource in a jar file, * Determine whether the given URL points to a resource in a jar file,
* that is, has protocol "jar", "zip", "wsjar" or "code-source". * that is, has protocol "jar", "zip", "vfszip" or "wsjar".
* <p>"zip" and "wsjar" are used by WebLogic Server and WebSphere, respectively,
* but can be treated like jar files.
* @param url the URL to check * @param url the URL to check
* @return whether the URL has been identified as a JAR URL * @return whether the URL has been identified as a JAR URL
*/ */
public static boolean isJarURL(URL url) { public static boolean isJarURL(URL url) {
String protocol = url.getProtocol(); String protocol = url.getProtocol();
return (URL_PROTOCOL_JAR.equals(protocol) || URL_PROTOCOL_ZIP.equals(protocol) || return (URL_PROTOCOL_JAR.equals(protocol) || URL_PROTOCOL_ZIP.equals(protocol) ||
URL_PROTOCOL_WSJAR.equals(protocol) || URL_PROTOCOL_VFSZIP.equals(protocol)); URL_PROTOCOL_VFSZIP.equals(protocol) || URL_PROTOCOL_WSJAR.equals(protocol));
} }
/** /**