Author: ningjiang Date: Fri Nov 16 05:59:56 2012 New Revision: 1410204 URL: http://svn.apache.org/viewvc?rev=1410204&view=rev Log: Merged revisions 1410202 via svnmerge from https://svn.apache.org/repos/asf/cxf/branches/2.6.x-fixes
................ r1410202 | ningjiang | 2012-11-16 13:42:41 +0800 (Fri, 16 Nov 2012) | 9 lines Merged revisions 1410201 via svnmerge from https://svn.apache.org/repos/asf/cxf/trunk ........ r1410201 | ningjiang | 2012-11-16 13:32:22 +0800 (Fri, 16 Nov 2012) | 1 line Fixed the NPE WSDLServiceUtils ........ ................ Modified: cxf/branches/2.5.x-fixes/ (props changed) cxf/branches/2.5.x-fixes/rt/core/src/main/java/org/apache/cxf/wsdl11/WSDLServiceUtils.java cxf/branches/2.5.x-fixes/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBDataBindingTest.java Propchange: cxf/branches/2.5.x-fixes/ ------------------------------------------------------------------------------ Merged /cxf/trunk:r1410201 Merged /cxf/branches/2.6.x-fixes:r1410202 Propchange: cxf/branches/2.5.x-fixes/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: cxf/branches/2.5.x-fixes/rt/core/src/main/java/org/apache/cxf/wsdl11/WSDLServiceUtils.java URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/rt/core/src/main/java/org/apache/cxf/wsdl11/WSDLServiceUtils.java?rev=1410204&r1=1410203&r2=1410204&view=diff ============================================================================== --- cxf/branches/2.5.x-fixes/rt/core/src/main/java/org/apache/cxf/wsdl11/WSDLServiceUtils.java (original) +++ cxf/branches/2.5.x-fixes/rt/core/src/main/java/org/apache/cxf/wsdl11/WSDLServiceUtils.java Fri Nov 16 05:59:56 2012 @@ -41,7 +41,10 @@ public final class WSDLServiceUtils { sb.delete(0, sb.length()); sb.append(ext.getElementType().getNamespaceURI()); try { - factory = bus.getExtension(BindingFactoryManager.class).getBindingFactory(sb.toString()); + BindingFactoryManager manager = bus.getExtension(BindingFactoryManager.class); + if (manager != null) { + factory = manager.getBindingFactory(sb.toString()); + } } catch (BusException e) { // ignore, we'll use a generic BindingInfo } Modified: cxf/branches/2.5.x-fixes/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBDataBindingTest.java URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBDataBindingTest.java?rev=1410204&r1=1410203&r2=1410204&view=diff ============================================================================== --- cxf/branches/2.5.x-fixes/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBDataBindingTest.java (original) +++ cxf/branches/2.5.x-fixes/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBDataBindingTest.java Fri Nov 16 05:59:56 2012 @@ -96,7 +96,7 @@ public class JAXBDataBindingTest extends bindingFactoryManager = control.createMock(BindingFactoryManager.class); destinationFactoryManager = control.createMock(DestinationFactoryManager.class); - EasyMock.expect(bus.getExtension(BindingFactoryManager.class)).andReturn(bindingFactoryManager); + EasyMock.expect(bus.getExtension(BindingFactoryManager.class)).andStubReturn(bindingFactoryManager); EasyMock.expect(bus.getExtension(DestinationFactoryManager.class)) .andStubReturn(destinationFactoryManager);
