Author: ay
Date: Fri Dec 6 12:01:55 2013
New Revision: 1548497
URL: http://svn.apache.org/r1548497
Log:
Merged revisions 1548496 via git cherry-pick from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1548496 | ay | 2013-12-06 12:58:57 +0100 (Fri, 06 Dec 2013) | 2 lines
[CXF-5440] NPE is thrown at http conduit's authorization setting in BP
........
Modified:
cxf/branches/2.7.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/blueprint/HolderUtils.java
Modified:
cxf/branches/2.7.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/blueprint/HolderUtils.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/blueprint/HolderUtils.java?rev=1548497&r1=1548496&r2=1548497&view=diff
==============================================================================
---
cxf/branches/2.7.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/blueprint/HolderUtils.java
(original)
+++
cxf/branches/2.7.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/blueprint/HolderUtils.java
Fri Dec 6 12:01:55 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) {
