Author: richard.opalka(a)jboss.com Date: 2010-11-29 11:32:03 -0500 (Mon, 29 Nov 2010) New Revision: 13363 Modified: common/branches/jbossws-common-1.4.1/src/main/java/org/jboss/wsf/common/injection/ThreadLocalAwareWebServiceContext.java Log: according to JAXWS spec, it is recommended to throw IllegalStateException if WS context is accessed in wrong conditions Modified: common/branches/jbossws-common-1.4.1/src/main/java/org/jboss/wsf/common/injection/ThreadLocalAwareWebServiceContext.java =================================================================== --- common/branches/jbossws-common-1.4.1/src/main/java/org/jboss/wsf/common/injection/ThreadLocalAwareWebServiceContext.java 2010-11-29 16:31:43 UTC (rev 13362) +++ common/branches/jbossws-common-1.4.1/src/main/java/org/jboss/wsf/common/injection/ThreadLocalAwareWebServiceContext.java 2010-11-29 16:32:03 UTC (rev 13363) @@ -57,32 +57,62 @@ public EndpointReference getEndpointReference(final Element... referenceParameters) { final WebServiceContext delegee = this.contexts.get(); - return delegee == null ? null : delegee.getEndpointReference(referenceParameters); + + if (delegee == null) + { + throw new IllegalStateException(); + } + + return delegee.getEndpointReference(referenceParameters); } public <T extends EndpointReference> T getEndpointReference(final Class<T> clazz, final Element... referenceParameters) { final WebServiceContext delegee = this.contexts.get(); - return delegee == null ? null : delegee.getEndpointReference(clazz, referenceParameters); + + if (delegee == null) + { + throw new IllegalStateException(); + } + + return delegee.getEndpointReference(clazz, referenceParameters); } public MessageContext getMessageContext() { final WebServiceContext delegee = this.contexts.get(); - return delegee == null ? null : delegee.getMessageContext(); + + if (delegee == null) + { + throw new IllegalStateException(); + } + + return delegee.getMessageContext(); } public Principal getUserPrincipal() { final WebServiceContext delegee = this.contexts.get(); - return delegee == null ? null : delegee.getUserPrincipal(); + + if (delegee == null) + { + throw new IllegalStateException(); + } + + return delegee.getUserPrincipal(); } public boolean isUserInRole(String role) { final WebServiceContext delegee = this.contexts.get(); - return delegee == null ? false : delegee.isUserInRole(role); + + if (delegee == null) + { + throw new IllegalStateException(); + } + + return delegee.isUserInRole(role); } }