Author: ay
Date: Fri Dec 6 11:58:57 2013
New Revision: 1548496
URL: http://svn.apache.org/r1548496
Log:
[CXF-5440] NPE is thrown at http conduit's authorization setting in BP
Modified:
cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/blueprint/HolderUtils.java
Modified:
cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/blueprint/HolderUtils.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/blueprint/HolderUtils.java?rev=1548496&r1=1548495&r2=1548496&view=diff
==============================================================================
---
cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/blueprint/HolderUtils.java
(original)
+++
cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/blueprint/HolderUtils.java
Fri Dec 6 11:58:57 2013
@@ -45,7 +45,7 @@ public final class HolderUtils {
try {
Unmarshaller umr = getContext(c, jaxbContext, jaxbClasses,
cl).createUnmarshaller();
- JAXBElement<?> ele = (JAXBElement<?>) umr.unmarshal(parent);
+ JAXBElement<?> ele = (JAXBElement<?>) umr.unmarshal(parent, c);
return ele.getValue();
} catch (JAXBException e) {
