1.1 --- a/src/share/jaxws_classes/com/sun/xml/internal/ws/client/dispatch/DispatchImpl.java Thu May 30 10:58:13 2013 -0700 1.2 +++ b/src/share/jaxws_classes/com/sun/xml/internal/ws/client/dispatch/DispatchImpl.java Wed Jun 12 14:47:09 2013 +0100 1.3 @@ -386,8 +386,10 @@ 1.4 endpoint = (String) requestContext.get(BindingProvider.ENDPOINT_ADDRESS_PROPERTY); 1.5 } 1.6 // This is existing before packetTakesPriorityOverRequestContext so leaving in place. 1.7 - if (endpoint == null) 1.8 + if (endpoint == null) { 1.9 + if (message.endpointAddress == null) throw new WebServiceException(DispatchMessages.INVALID_NULLARG_URI()); 1.10 endpoint = message.endpointAddress.toString(); 1.11 + } 1.12 1.13 String pathInfo = null; 1.14 String queryString = null;