Fix to AXISCPP-407 may break samples

[Samisa Abeysinghe]

Fix to issue AXISCPP-407 may break samples.

If there are problems please update the generated code.

Thanks,
Samisa...