Updated Branches:
  refs/heads/master bbe24c806 -> 3d03a6a50

WICKET-4845 Make BasicResourceReferenceMapper public so it is easy to extend it

Reduce the usage of Strings where just 'char' is enough.


Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/3d03a6a5
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/3d03a6a5
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/3d03a6a5

Branch: refs/heads/master
Commit: 3d03a6a508fa8af1a284d4fe6b5030cb2b21012b
Parents: 3e3fbf8
Author: Martin Tzvetanov Grigorov <[email protected]>
Authored: Fri Nov 2 15:58:33 2012 +0200
Committer: Martin Tzvetanov Grigorov <[email protected]>
Committed: Fri Nov 2 16:05:36 2012 +0200

----------------------------------------------------------------------
 .../mapper/BasicResourceReferenceMapper.java       |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/wicket/blob/3d03a6a5/wicket-core/src/main/java/org/apache/wicket/core/request/mapper/BasicResourceReferenceMapper.java
----------------------------------------------------------------------
diff --git 
a/wicket-core/src/main/java/org/apache/wicket/core/request/mapper/BasicResourceReferenceMapper.java
 
b/wicket-core/src/main/java/org/apache/wicket/core/request/mapper/BasicResourceReferenceMapper.java
index c785a5d..a9c4b5c 100755
--- 
a/wicket-core/src/main/java/org/apache/wicket/core/request/mapper/BasicResourceReferenceMapper.java
+++ 
b/wicket-core/src/main/java/org/apache/wicket/core/request/mapper/BasicResourceReferenceMapper.java
@@ -103,8 +103,8 @@ public class BasicResourceReferenceMapper extends 
AbstractResourceReferenceMappe
                        {
                                String segment = url.getSegments().get(i);
 
-                               // skip possibly malicious segments
-                               if (segment.contains("/"))
+                               // ignore invalid segments
+                               if (segment.indexOf('/') > -1)
                                {
                                        return null;
                                }
@@ -122,7 +122,7 @@ public class BasicResourceReferenceMapper extends 
AbstractResourceReferenceMappe
                                }
                                if (name.length() > 0)
                                {
-                                       name.append("/");
+                                       name.append('/');
                                }
                                name.append(segment);
                        }

Reply via email to