svn commit: r646331 - in /wicket/branches/wicket-1.3.x/jdk-1.4/wicket/src/main/java/org/apache/wicket: markup/MarkupCache.java protocol/http/WicketFilter.java

[jcompagner]

Author: jcompagner
Date: Wed Apr  9 06:18:38 2008
New Revision: 646331

URL: http://svn.apache.org/viewvc?rev=646331&view=rev
Log:
try catch around close in WicketFilter.doGet()
fix WICKET-1501 loadMarkup shouldn't call put into cache if the cache string is 
null

Modified:
    
wicket/branches/wicket-1.3.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/MarkupCache.java
    
wicket/branches/wicket-1.3.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/WicketFilter.java

Modified: 
wicket/branches/wicket-1.3.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/MarkupCache.java
URL: 
http://svn.apache.org/viewvc/wicket/branches/wicket-1.3.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/MarkupCache.java?rev=646331&r1=646330&r2=646331&view=diff
==============================================================================
--- 
wicket/branches/wicket-1.3.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/MarkupCache.java
 (original)
+++ 
wicket/branches/wicket-1.3.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/MarkupCache.java
 Wed Apr  9 06:18:38 2008
@@ -437,8 +437,9 @@
                        {
                                // add the markup to the cache.
                                markupKeyCache.put(cacheKey, locationString);
+                               return putIntoCache(locationString, markup);
                        }
-                       return putIntoCache(locationString, markup);
+                       return markup;
                }
                catch (ResourceStreamNotFoundException e)
                {

Modified: 
wicket/branches/wicket-1.3.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/WicketFilter.java
URL: 
http://svn.apache.org/viewvc/wicket/branches/wicket-1.3.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/WicketFilter.java?rev=646331&r1=646330&r2=646331&view=diff
==============================================================================
--- 
wicket/branches/wicket-1.3.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/WicketFilter.java
 (original)
+++ 
wicket/branches/wicket-1.3.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/WicketFilter.java
 Wed Apr  9 06:18:38 2008
@@ -385,7 +385,16 @@
                        {
                                // Close response
                                if (response != null)
-                                       response.close();
+                               {
+                                       try
+                                       {
+                                               response.close();
+                                       }
+                                       catch (Exception e)
+                                       {
+                                               log.error("closing the buffer 
error", e);
+                                       }
+                               }
 
                                // Clean up thread local session
                                Session.unset();