You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by re...@apache.org on 2007/11/29 23:24:13 UTC
svn commit: r599604 -
/cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-impl/src/main/java/org/apache/cocoon/servletservice/util/BlockCallHttpServletRequest.java
Author: reinhard
Date: Thu Nov 29 14:24:12 2007
New Revision: 599604
URL: http://svn.apache.org/viewvc?rev=599604&view=rev
Log:
fix test cases
Modified:
cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-impl/src/main/java/org/apache/cocoon/servletservice/util/BlockCallHttpServletRequest.java
Modified: cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-impl/src/main/java/org/apache/cocoon/servletservice/util/BlockCallHttpServletRequest.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-impl/src/main/java/org/apache/cocoon/servletservice/util/BlockCallHttpServletRequest.java?rev=599604&r1=599603&r2=599604&view=diff
==============================================================================
--- cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-impl/src/main/java/org/apache/cocoon/servletservice/util/BlockCallHttpServletRequest.java (original)
+++ cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-impl/src/main/java/org/apache/cocoon/servletservice/util/BlockCallHttpServletRequest.java Thu Nov 29 14:24:12 2007
@@ -130,10 +130,12 @@
*/
private Map createRequestAttributesMap(HttpServletRequest req) {
Map attributes = new HashMap();
- Enumeration parentAttributes = req.getAttributeNames();
- while (parentAttributes.hasMoreElements()) {
- String attr = (String) parentAttributes.nextElement();
- attributes.put(attr, req.getAttribute(attr));
+ if (req != null) {
+ Enumeration parentAttributes = req.getAttributeNames();
+ while (parentAttributes.hasMoreElements()) {
+ String attr = (String) parentAttributes.nextElement();
+ attributes.put(attr, req.getAttribute(attr));
+ }
}
return attributes;
}
@@ -143,10 +145,12 @@
*/
private Map createRequestHeaderMap(HttpServletRequest req) {
Map headers = new HashMap();
- Enumeration parentHeaders = req.getHeaderNames();
- while (parentHeaders.hasMoreElements()) {
- String header = (String) parentHeaders.nextElement();
- headers.put(header, req.getHeader(header));
+ if (req != null) {
+ Enumeration parentHeaders = req.getHeaderNames();
+ while (parentHeaders.hasMoreElements()) {
+ String header = (String) parentHeaders.nextElement();
+ headers.put(header, req.getHeader(header));
+ }
}
return headers;
}