Author: jim.ma
Date: 2013-06-25 02:14:04 -0400 (Tue, 25 Jun 2013)
New Revision: 17734
Modified:
common/branches/jbossws-common-2.1.x/
common/branches/jbossws-common-2.1.x/src/main/java/org/jboss/ws/common/deployment/AbstractDefaultEndpoint.java
Log:
Backport JBWS-3654(svn merge -r 17722:17724
https://svn.jboss.org/repos/jbossws/common/trunk)
Property changes on: common/branches/jbossws-common-2.1.x
___________________________________________________________________
Modified: svn:mergeinfo
- /common/branches/asoldano:14028-14056
/common/branches/ropalka:16964-17003
/common/branches/ropalka_JBWS-3550:16756
+ /common/branches/asoldano:14028-14056
/common/branches/ropalka:16964-17003
/common/branches/ropalka_JBWS-3550:16756
/common/trunk:17723-17724
Modified:
common/branches/jbossws-common-2.1.x/src/main/java/org/jboss/ws/common/deployment/AbstractDefaultEndpoint.java
===================================================================
---
common/branches/jbossws-common-2.1.x/src/main/java/org/jboss/ws/common/deployment/AbstractDefaultEndpoint.java 2013-06-24
17:33:29 UTC (rev 17733)
+++
common/branches/jbossws-common-2.1.x/src/main/java/org/jboss/ws/common/deployment/AbstractDefaultEndpoint.java 2013-06-25
06:14:04 UTC (rev 17734)
@@ -158,12 +158,12 @@
}
- public EndpointState getState()
+ public synchronized EndpointState getState()
{
return state;
}
- public void setState(EndpointState state)
+ public synchronized void setState(EndpointState state)
{
this.state = state;
}
@@ -249,7 +249,7 @@
super.setProperty(key, value);
}
- protected void assertEndpointSetterAccess()
+ protected synchronized void assertEndpointSetterAccess()
{
if (state == EndpointState.STARTED)
throw Messages.MESSAGES.cannotModifyEndpointInState(state, getName());