svn commit: r640771 - /wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/request/target/resource/SharedResourceRequestTarget.java

[jcompagner]

Author: jcompagner
Date: Tue Mar 25 04:19:33 2008
New Revision: 640771

URL: http://svn.apache.org/viewvc?rev=640771&view=rev
Log:
fix for WICKET-1446  Lazy registration in SharedResourceRequestTarget fails

Modified:
    
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/request/target/resource/SharedResourceRequestTarget.java

Modified: 
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/request/target/resource/SharedResourceRequestTarget.java
URL: 
http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/request/target/resource/SharedResourceRequestTarget.java?rev=640771&r1=640770&r2=640771&view=diff
==============================================================================
--- 
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/request/target/resource/SharedResourceRequestTarget.java
 (original)
+++ 
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/request/target/resource/SharedResourceRequestTarget.java
 Tue Mar 25 04:19:33 2008
@@ -61,7 +61,7 @@
                else if (requestParameters.getResourceKey() == null)
                {
                        throw new 
IllegalArgumentException("requestParameters.getResourceKey() "
-                                       + "may not be null");
+                               + "may not be null");
                }
        }
 
@@ -81,7 +81,7 @@
                {
                        SharedResourceRequestTarget that = 
(SharedResourceRequestTarget)obj;
                        return getRequestParameters().getResourceKey().equals(
-                                       
that.getRequestParameters().getResourceKey());
+                               that.getRequestParameters().getResourceKey());
                }
                return false;
        }
@@ -150,7 +150,7 @@
                                        PackageResource packageResource = 
PackageResource.get(scope, path);
                                        if (sharedResources.get(resourceKey) == 
null)
                                        {
-                                               
sharedResources.add(resourceKey, packageResource);
+                                               sharedResources.add(scope, 
path, null, null, packageResource);
                                        }
                                        resource = packageResource;
                                }
@@ -170,7 +170,7 @@
                        if (response instanceof WebResponse)
                        {
                                
((WebResponse)response).getHttpServletResponse().setStatus(
-                                               
HttpServletResponse.SC_NOT_FOUND);
+                                       HttpServletResponse.SC_NOT_FOUND);
                                log.error("shared resource " + resourceKey + " 
not found");
                                return;
                        }
@@ -196,6 +196,6 @@
        public String toString()
        {
                return "[SharedResourceRequestTarget@" + hashCode() + ", 
resourceKey=" +
-                               getRequestParameters().getResourceKey() + "]";
+                       getRequestParameters().getResourceKey() + "]";
        }
 }