DefaultCxfMessageMapper.getBasePath creates a incorrect http path

    protected String getBasePath(Exchange camelExchange) {
        String answer = camelExchange.getIn().getHeader(Exchange.HTTP_BASE_URI, String.class);
        if (answer == null) {
            answer = camelExchange.getFromEndpoint().getEndpointUri();
        }        
        return answer;
    }

    protected String getBasePath(Exchange camelExchange) {
        String answer = camelExchange.getIn().getHeader(Exchange.HTTP_BASE_URI, String.class);

        if (answer == null) {
            Endpoint fromEndpoint = camelExchange.getFromEndpoint();
            if (fromEndpoint instanceof HttpCommonEndpoint) {
              try {
                URI u = ((HttpCommonEndpoint) fromEndpoint). getHttpUri();
                answer = new URI(u.getScheme(), u.getUserInfo(), u.getHost(), u.getPort(), u.getPath(),
                        null, null).toString();
              } catch (URISyntaxException ex) {
                throw new RuntimeException(ex);
              }
            } else {
              return null;
            }
        }

        return answer;
    }