You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by ju...@apache.org on 2012/01/17 17:40:02 UTC
svn commit: r1232469 - in /jackrabbit/branches/2.4: ./
jackrabbit-spi2dav/src/main/java/org/apache/jackrabbit/spi2davex/ValueLoader.java
Author: jukka
Date: Tue Jan 17 16:40:01 2012
New Revision: 1232469
URL: http://svn.apache.org/viewvc?rev=1232469&view=rev
Log:
2.4: Merged revision 1232100 (JCR-3210)
Modified:
jackrabbit/branches/2.4/ (props changed)
jackrabbit/branches/2.4/jackrabbit-spi2dav/src/main/java/org/apache/jackrabbit/spi2davex/ValueLoader.java
Propchange: jackrabbit/branches/2.4/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 17 16:40:01 2012
@@ -1,3 +1,3 @@
/jackrabbit/branches/JCR-2272:1173165-1176545
/jackrabbit/sandbox/JCR-2415-lucene-3.0:1060860-1064038
-/jackrabbit/trunk:1221447,1221579,1221593,1221789,1221818,1225179,1225191,1225196,1225207,1225525,1225528,1226452,1226472,1226515,1226750,1227240
+/jackrabbit/trunk:1221447,1221579,1221593,1221789,1221818,1225179,1225191,1225196,1225207,1225525,1225528,1226452,1226472,1226515,1226750,1227240,1232100
Modified: jackrabbit/branches/2.4/jackrabbit-spi2dav/src/main/java/org/apache/jackrabbit/spi2davex/ValueLoader.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.4/jackrabbit-spi2dav/src/main/java/org/apache/jackrabbit/spi2davex/ValueLoader.java?rev=1232469&r1=1232468&r2=1232469&view=diff
==============================================================================
--- jackrabbit/branches/2.4/jackrabbit-spi2dav/src/main/java/org/apache/jackrabbit/spi2davex/ValueLoader.java (original)
+++ jackrabbit/branches/2.4/jackrabbit-spi2dav/src/main/java/org/apache/jackrabbit/spi2davex/ValueLoader.java Tue Jan 17 16:40:01 2012
@@ -16,6 +16,7 @@
*/
package org.apache.jackrabbit.spi2davex;
+import org.apache.commons.httpclient.Header;
import org.apache.commons.httpclient.HttpClient;
import org.apache.commons.httpclient.methods.GetMethod;
import org.apache.commons.httpclient.methods.HeadMethod;
@@ -74,7 +75,10 @@ class ValueLoader {
if (statusCode == DavServletResponse.SC_OK) {
Map<String, String> headers = new HashMap<String, String>();
for (String name : headerNames) {
- headers.put(name, method.getResponseHeader(name).getValue());
+ Header hdr = method.getResponseHeader(name);
+ if (hdr != null) {
+ headers.put(name, hdr.getValue());
+ }
}
return headers;
} else {