Author: jcompagner
Date: Sun May 4 08:18:14 2008
New Revision: 653226
URL: http://svn.apache.org/viewvc?rev=653226&view=rev
Log:
WICKET-1556 Non-existant package resources lazily added to pool
Modified:
wicket/branches/wicket-1.3.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/request/target/resource/SharedResourceRequestTarget.java
Modified:
wicket/branches/wicket-1.3.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/request/target/resource/SharedResourceRequestTarget.java
URL:
http://svn.apache.org/viewvc/wicket/branches/wicket-1.3.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/request/target/resource/SharedResourceRequestTarget.java?rev=653226&r1=653225&r2=653226&view=diff
==============================================================================
---
wicket/branches/wicket-1.3.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/request/target/resource/SharedResourceRequestTarget.java
(original)
+++
wicket/branches/wicket-1.3.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/request/target/resource/SharedResourceRequestTarget.java
Sun May 4 08:18:14 2008
@@ -147,12 +147,15 @@
}
String path = resourceKey.substring(ix
+ 1);
- PackageResource packageResource =
PackageResource.get(scope, path);
- if (sharedResources.get(resourceKey) ==
null)
+ if (PackageResource.exists(scope, path,
null, null))
{
- sharedResources.add(scope,
path, null, null, packageResource);
+ PackageResource packageResource
= PackageResource.get(scope, path);
+ if
(sharedResources.get(resourceKey) == null)
+ {
+
sharedResources.add(scope, path, null, null, packageResource);
+ }
+ resource = packageResource;
}
- resource = packageResource;
}
catch (Exception e)
{