Author: pete
Date: Fri May 6 15:16:18 2011
New Revision: 1100250
URL: http://svn.apache.org/viewvc?rev=1100250&view=rev
Log:
remove query string part when determining file extension
Modified:
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/resource/ResourceReference.java
Modified:
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/resource/ResourceReference.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/resource/ResourceReference.java?rev=1100250&r1=1100249&r2=1100250&view=diff
==============================================================================
---
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/resource/ResourceReference.java
(original)
+++
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/resource/ResourceReference.java
Fri May 6 15:16:18 2011
@@ -129,16 +129,28 @@ public abstract class ResourceReference
*/
public final String getExtension()
{
- final String name = getName();
+ String name = getName();
+
+ final int queryAt = name.indexOf('?');
+
+ // remove query string part
+ if (queryAt != -1)
+ {
+ name = name.substring(0, queryAt);
+ }
+
+ // get start of extension
final int extPos = name.lastIndexOf('.');
-
- if(extPos == -1)
+
+ if (extPos == -1)
{
return null;
}
+
+ // return extension
return name.substring(extPos + 1).toLowerCase();
}
-
+
/**
* @return scope
*/
