Author: dkulp
Date: Sun Mar 14 17:57:38 2010
New Revision: 922917
URL: http://svn.apache.org/viewvc?rev=922917&view=rev
Log:
Merged revisions 922913 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r922913 | dkulp | 2010-03-14 13:47:17 -0400 (Sun, 14 Mar 2010) | 1 line
Split line into 3 to try and debug which part is causing the NPE
........
Modified:
cxf/branches/2.2.x-fixes/ (props changed)
cxf/branches/2.2.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapBindingFactory.java
Propchange: cxf/branches/2.2.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified:
cxf/branches/2.2.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapBindingFactory.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapBindingFactory.java?rev=922917&r1=922916&r2=922917&view=diff
==============================================================================
---
cxf/branches/2.2.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapBindingFactory.java
(original)
+++
cxf/branches/2.2.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapBindingFactory.java
Sun Mar 14 17:57:38 2010
@@ -182,8 +182,9 @@ public class SoapBindingFactory extends
private void createSoapBinding(final SoapBindingInfo bi) throws
WSDLException {
boolean isSoap12 = bi.getSoapVersion() instanceof Soap12;
- ExtensionRegistry extensionRegistry =
getBus().getExtension(WSDLManager.class)
- .getExtensionRegistry();
+ Bus bs = getBus();
+ WSDLManager m = bs.getExtension(WSDLManager.class);
+ ExtensionRegistry extensionRegistry = m.getExtensionRegistry();
SoapBinding soapBinding =
SOAPBindingUtil.createSoapBinding(extensionRegistry, isSoap12);
soapBinding.setStyle(bi.getStyle());