svn commit: r584624 - in /wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket: markup/html/image/resource/LocalizedImageResource.java protocol/http/request/WebRequestCodingStrategy.java

[knopp]

Author: knopp
Date: Sun Oct 14 15:13:38 2007
New Revision: 584624

URL: http://svn.apache.org/viewvc?rev=584624&view=rev
Log:
WICKET-1047

Modified:
    
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/image/resource/LocalizedImageResource.java
    
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/request/WebRequestCodingStrategy.java

Modified: 
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/image/resource/LocalizedImageResource.java
URL: 
http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/image/resource/LocalizedImageResource.java?rev=584624&r1=584623&r2=584624&view=diff
==============================================================================
--- 
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/image/resource/LocalizedImageResource.java
 (original)
+++ 
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/image/resource/LocalizedImageResource.java
 Sun Oct 14 15:13:38 2007
@@ -322,7 +322,8 @@
                }
 
                // Set the SRC attribute to point to the component or shared 
resource
-               tag.put("src", 
RequestCycle.get().getOriginalResponse().encodeURL(url));
+               tag.put("src", 
RequestCycle.get().getOriginalResponse().encodeURL(
+                               Strings.replaceAll(url, "&", "&")));
        }
 
        /**

Modified: 
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/request/WebRequestCodingStrategy.java
URL: 
http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/request/WebRequestCodingStrategy.java?rev=584624&r1=584623&r2=584624&view=diff
==============================================================================
--- 
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/request/WebRequestCodingStrategy.java
 (original)
+++ 
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/request/WebRequestCodingStrategy.java
 Sun Oct 14 15:13:38 2007
@@ -830,7 +830,7 @@
                                        buffer.append(entry.getValue());
                                        if (it.hasNext())
                                        {
-                                               buffer.append("&");
+                                               buffer.append('&');
                                        }
                                }
                        }