You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by cz...@apache.org on 2014/08/14 05:32:21 UTC
svn commit: r1617868 -
/sling/trunk/bundles/resourceresolver/src/main/java/org/apache/sling/resourceresolver/impl/mapping/MapEntry.java
Author: cziegeler
Date: Thu Aug 14 03:32:20 2014
New Revision: 1617868
URL: http://svn.apache.org/r1617868
Log:
SLING-3817 : MockedResourceResolverImplTest.testMapping fails under Java 8 with Illegal group reference: group index is missing. Apply patch from Bob Paulin
Modified:
sling/trunk/bundles/resourceresolver/src/main/java/org/apache/sling/resourceresolver/impl/mapping/MapEntry.java
Modified: sling/trunk/bundles/resourceresolver/src/main/java/org/apache/sling/resourceresolver/impl/mapping/MapEntry.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/resourceresolver/src/main/java/org/apache/sling/resourceresolver/impl/mapping/MapEntry.java?rev=1617868&r1=1617867&r2=1617868&view=diff
==============================================================================
--- sling/trunk/bundles/resourceresolver/src/main/java/org/apache/sling/resourceresolver/impl/mapping/MapEntry.java (original)
+++ sling/trunk/bundles/resourceresolver/src/main/java/org/apache/sling/resourceresolver/impl/mapping/MapEntry.java Thu Aug 14 03:32:20 2014
@@ -63,7 +63,7 @@ public class MapEntry implements Compara
private final String[] redirect;
private final int status;
-
+
private long order;
public static String appendSlash(String path) {
@@ -274,8 +274,10 @@ public class MapEntry implements Compara
for (int i = 0; i < redirects.length; i++) {
try{
results[i] = m.replaceFirst(redirects[i]);
- }catch(StringIndexOutOfBoundsException siob){
- log.debug("Exception while replacing, ignoring entry {} ",redirects[i],siob);
+ } catch (final StringIndexOutOfBoundsException siob){
+ log.debug("Exception while replacing, ignoring entry {} ", redirects[i], siob);
+ } catch (final IllegalArgumentException iae){
+ log.debug("Exception while replacing, ignoring entry {} ", redirects[i], iae);
}
}
return results;