Author: michiel
Date: 2009-06-05 22:54:52 +0200 (Fri, 05 Jun 2009)
New Revision: 35799
Modified:
mmbase/trunk/core/src/main/java/org/mmbase/framework/CachedRenderer.java
Log:
Fixed NPE if no cache-control header. MMB-1829
Modified:
mmbase/trunk/core/src/main/java/org/mmbase/framework/CachedRenderer.java
===================================================================
--- mmbase/trunk/core/src/main/java/org/mmbase/framework/CachedRenderer.java
2009-06-05 20:40:16 UTC (rev 35798)
+++ mmbase/trunk/core/src/main/java/org/mmbase/framework/CachedRenderer.java
2009-06-05 20:54:52 UTC (rev 35799)
@@ -318,7 +318,9 @@
if (uri == null) throw new FrameworkException("" + getWraps()
+ " did not return an URI, and cannot be cached using getLastModified");
URLConnection connection = uri.toURL().openConnection();
connection.setConnectTimeout(timeout);
- List<String> cacheControl =
Arrays.asList(connection.getHeaderField("Cache-Control").toLowerCase().split("\\s*,\\s*"));
+ String cacheControlHeader =
connection.getHeaderField("Cache-Control");
+ if (cacheControlHeader == null) cacheControlHeader = "";
+ List<String> cacheControl =
Arrays.asList(cacheControlHeader.toLowerCase().split("\\s*,\\s*"));
if (cacheControl.contains("no-cache") ||
cacheControl.contains("no-store")) {
log.warn("The response for " + uri + " cannot be
implicitely cached (Because of Cache-Control: " + cacheControl + ") Use the
'expires' parameter on " + this + " to override this, because it will _not_ be
cached now.");
getWraps().render(blockParameters, w, hints);
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
