You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by wt...@apache.org on 2017/04/07 18:41:15 UTC

svn commit: r1790613 - in /myfaces/core/branches/2.3.x: impl/src/main/java/org/apache/myfaces/resource/ExternalContextContractResourceLoader.java shared/src/main/java/org/apache/myfaces/shared/resource/ExternalContextResourceLoader.java

Author: wtlucy
Date: Fri Apr  7 18:41:15 2017
New Revision: 1790613

URL: http://svn.apache.org/viewvc?rev=1790613&view=rev
Log:
MYFACES-4107 - fix StringIndexOutOfBoundsException in getResourceVersion

Modified:
    myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/resource/ExternalContextContractResourceLoader.java
    myfaces/core/branches/2.3.x/shared/src/main/java/org/apache/myfaces/shared/resource/ExternalContextResourceLoader.java

Modified: myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/resource/ExternalContextContractResourceLoader.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/resource/ExternalContextContractResourceLoader.java?rev=1790613&r1=1790612&r2=1790613&view=diff
==============================================================================
--- myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/resource/ExternalContextContractResourceLoader.java (original)
+++ myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/resource/ExternalContextContractResourceLoader.java Fri Apr  7 18:41:15 2017
@@ -83,7 +83,11 @@ public class ExternalContextContractReso
             // are found, let resourceVersion remain null.
             for (String resourcePath : resourcePaths)
             {
-                String version = resourcePath.substring(path.length());
+                String version = "";
+                if (path.length() < resourcePath.length()) 
+                {
+                    version = resourcePath.substring(path.length());
+                }
 
                 if (RESOURCE_VERSION_CHECKER.matcher(version).matches())
                 {

Modified: myfaces/core/branches/2.3.x/shared/src/main/java/org/apache/myfaces/shared/resource/ExternalContextResourceLoader.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.3.x/shared/src/main/java/org/apache/myfaces/shared/resource/ExternalContextResourceLoader.java?rev=1790613&r1=1790612&r2=1790613&view=diff
==============================================================================
--- myfaces/core/branches/2.3.x/shared/src/main/java/org/apache/myfaces/shared/resource/ExternalContextResourceLoader.java (original)
+++ myfaces/core/branches/2.3.x/shared/src/main/java/org/apache/myfaces/shared/resource/ExternalContextResourceLoader.java Fri Apr  7 18:41:15 2017
@@ -79,7 +79,11 @@ public class ExternalContextResourceLoad
             // are found, let resourceVersion remain null.
             for (String resourcePath : resourcePaths)
             {
-                String version = resourcePath.substring(path.length());
+                String version = "";
+                if (path.length() < resourcePath.length()) 
+                {
+                    version = resourcePath.substring(path.length());
+                }
 
                 if (RESOURCE_VERSION_CHECKER.matcher(version).matches())
                 {