JBossWS SVN: r10050 - in framework/trunk/testsuite/test: java/org/jboss/test/ws/jaxws/jbws2074/usecase1/client and 12 other directories.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2009-05-19 05:03:30 -0400 (Tue, 19 May 2009)
New Revision: 10050
Added:
framework/trunk/testsuite/test/resources/jaxws/jbws2074/usecase1-sar/
framework/trunk/testsuite/test/resources/jaxws/jbws2074/usecase1-sar/META-INF/
framework/trunk/testsuite/test/resources/jaxws/jbws2074/usecase1-sar/META-INF/application.xml
framework/trunk/testsuite/test/resources/jaxws/jbws2074/usecase2-sar/
framework/trunk/testsuite/test/resources/jaxws/jbws2074/usecase2-sar/META-INF/
framework/trunk/testsuite/test/resources/jaxws/jbws2074/usecase2-sar/META-INF/application.xml
framework/trunk/testsuite/test/resources/jaxws/jbws2074/usecase3-sar/
framework/trunk/testsuite/test/resources/jaxws/jbws2074/usecase3-sar/META-INF/
framework/trunk/testsuite/test/resources/jaxws/jbws2074/usecase3-sar/META-INF/application.xml
framework/trunk/testsuite/test/resources/jaxws/jbws2074/usecase4-sar/
framework/trunk/testsuite/test/resources/jaxws/jbws2074/usecase4-sar/META-INF/
framework/trunk/testsuite/test/resources/jaxws/jbws2074/usecase4-sar/META-INF/application.xml
Modified:
framework/trunk/testsuite/test/ant-import/build-jars-jaxws.xml
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2074/usecase1/client/JBWS2074TestCase.java
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2074/usecase2/client/JBWS2074TestCase.java
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2074/usecase3/client/JBWS2074TestCase.java
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2074/usecase4/client/JBWS2074TestCase.java
Log:
[JBWS-2074] extending test case
Modified: framework/trunk/testsuite/test/ant-import/build-jars-jaxws.xml
===================================================================
--- framework/trunk/testsuite/test/ant-import/build-jars-jaxws.xml 2009-05-18 11:20:46 UTC (rev 10049)
+++ framework/trunk/testsuite/test/ant-import/build-jars-jaxws.xml 2009-05-19 09:03:30 UTC (rev 10050)
@@ -560,6 +560,38 @@
<include name="ejb-jar.xml"/>
</metainf>
</jar>
+ <jar jarfile="${tests.output.dir}/test-libs/jaxws-jbws2074-usecase1.sar">
+ <fileset dir="${tests.output.dir}/test-libs">
+ <include name="jaxws-jbws2074-usecase1.war"/>
+ </fileset>
+ <metainf dir="${tests.output.dir}/test-resources/jaxws/jbws2074/usecase1-sar/META-INF">
+ <include name="application.xml"/>
+ </metainf>
+ </jar>
+ <jar jarfile="${tests.output.dir}/test-libs/jaxws-jbws2074-usecase2.sar">
+ <fileset dir="${tests.output.dir}/test-libs">
+ <include name="jaxws-jbws2074-usecase2.jar"/>
+ </fileset>
+ <metainf dir="${tests.output.dir}/test-resources/jaxws/jbws2074/usecase2-sar/META-INF">
+ <include name="application.xml"/>
+ </metainf>
+ </jar>
+ <jar jarfile="${tests.output.dir}/test-libs/jaxws-jbws2074-usecase3.sar">
+ <fileset dir="${tests.output.dir}/test-libs">
+ <include name="jaxws-jbws2074-usecase3.war"/>
+ </fileset>
+ <metainf dir="${tests.output.dir}/test-resources/jaxws/jbws2074/usecase3-sar/META-INF">
+ <include name="application.xml"/>
+ </metainf>
+ </jar>
+ <jar jarfile="${tests.output.dir}/test-libs/jaxws-jbws2074-usecase4.sar">
+ <fileset dir="${tests.output.dir}/test-libs">
+ <include name="jaxws-jbws2074-usecase4.jar"/>
+ </fileset>
+ <metainf dir="${tests.output.dir}/test-resources/jaxws/jbws2074/usecase4-sar/META-INF">
+ <include name="application.xml"/>
+ </metainf>
+ </jar>
<!-- jaxws-jbws2150 -->
<war warfile="${tests.output.dir}/test-libs/jaxws-jbws2150.war" webxml="${tests.output.dir}/test-resources/jaxws/jbws2150/WEB-INF/web.xml">
Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2074/usecase1/client/JBWS2074TestCase.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2074/usecase1/client/JBWS2074TestCase.java 2009-05-18 11:20:46 UTC (rev 10049)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2074/usecase1/client/JBWS2074TestCase.java 2009-05-19 09:03:30 UTC (rev 10050)
@@ -41,10 +41,10 @@
{
public static Test suite()
{
- return new JBossWSTestSetup(JBWS2074TestCase.class, "jaxws-jbws2074-usecase1.war");
+ return new JBossWSTestSetup(JBWS2074TestCase.class, "");
}
- public void testUsecase1() throws Exception
+ public void executeTest() throws Exception
{
String endpointAddress = "http://" + getServerHost() + ":8080/jaxws-jbws2074-usecase1/Service";
QName serviceName = new QName("http://ws.jboss.org/jbws2074", "POJOService");
@@ -62,4 +62,30 @@
assertEquals(expStr.toString(), retStr);
}
+ public void testUsecase1WithoutSar() throws Exception
+ {
+ try
+ {
+ deploy("jaxws-jbws2074-usecase1.war");
+ executeTest();
+ }
+ finally
+ {
+ undeploy("jaxws-jbws2074-usecase1.war");
+ }
+ }
+
+ public void testUsecase1WithSar() throws Exception
+ {
+ try
+ {
+ deploy("jaxws-jbws2074-usecase1.sar");
+ executeTest();
+ }
+ finally
+ {
+ undeploy("jaxws-jbws2074-usecase1.sar");
+ }
+ }
+
}
Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2074/usecase2/client/JBWS2074TestCase.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2074/usecase2/client/JBWS2074TestCase.java 2009-05-18 11:20:46 UTC (rev 10049)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2074/usecase2/client/JBWS2074TestCase.java 2009-05-19 09:03:30 UTC (rev 10050)
@@ -41,10 +41,10 @@
{
public static Test suite()
{
- return new JBossWSTestSetup(JBWS2074TestCase.class, "jaxws-jbws2074-usecase2.jar");
+ return new JBossWSTestSetup(JBWS2074TestCase.class, "");
}
- public void testUsecase1() throws Exception
+ public void executeTest() throws Exception
{
String endpointAddress = "http://" + getServerHost() + ":8080/jaxws-jbws2074-usecase2/Service";
QName serviceName = new QName("http://ws.jboss.org/jbws2074", "EJB3Service");
@@ -58,4 +58,30 @@
assertEquals(expStr.toString(), retStr);
}
+ public void testUsecase2WithoutSar() throws Exception
+ {
+ try
+ {
+ deploy("jaxws-jbws2074-usecase2.jar");
+ executeTest();
+ }
+ finally
+ {
+ undeploy("jaxws-jbws2074-usecase2.jar");
+ }
+ }
+
+ public void testUsecase2WithSar() throws Exception
+ {
+ try
+ {
+ deploy("jaxws-jbws2074-usecase2.sar");
+ executeTest();
+ }
+ finally
+ {
+ undeploy("jaxws-jbws2074-usecase2.sar");
+ }
+ }
+
}
Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2074/usecase3/client/JBWS2074TestCase.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2074/usecase3/client/JBWS2074TestCase.java 2009-05-18 11:20:46 UTC (rev 10049)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2074/usecase3/client/JBWS2074TestCase.java 2009-05-19 09:03:30 UTC (rev 10050)
@@ -41,10 +41,10 @@
{
public static Test suite()
{
- return new JBossWSTestSetup(JBWS2074TestCase.class, "jaxws-jbws2074-usecase3.war");
+ return new JBossWSTestSetup(JBWS2074TestCase.class, "");
}
- public void testUsecase1() throws Exception
+ public void executeTest() throws Exception
{
String endpointAddress = "http://" + getServerHost() + ":8080/jaxws-jbws2074-usecase3/Service";
QName serviceName = new QName("http://ws.jboss.org/jbws2074", "POJOService");
@@ -58,4 +58,30 @@
assertEquals(expStr.toString(), retStr);
}
+ public void testUsecase3WithoutSar() throws Exception
+ {
+ try
+ {
+ deploy("jaxws-jbws2074-usecase3.war");
+ executeTest();
+ }
+ finally
+ {
+ undeploy("jaxws-jbws2074-usecase3.war");
+ }
+ }
+
+ public void testUsecase3WithSar() throws Exception
+ {
+ try
+ {
+ deploy("jaxws-jbws2074-usecase3.sar");
+ executeTest();
+ }
+ finally
+ {
+ undeploy("jaxws-jbws2074-usecase3.sar");
+ }
+ }
+
}
Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2074/usecase4/client/JBWS2074TestCase.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2074/usecase4/client/JBWS2074TestCase.java 2009-05-18 11:20:46 UTC (rev 10049)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2074/usecase4/client/JBWS2074TestCase.java 2009-05-19 09:03:30 UTC (rev 10050)
@@ -42,10 +42,10 @@
public static Test suite()
{
- return new JBossWSTestSetup(JBWS2074TestCase.class, "jaxws-jbws2074-usecase4.jar");
+ return new JBossWSTestSetup(JBWS2074TestCase.class, "");
}
- public void testUsecase1() throws Exception
+ public void executeTest() throws Exception
{
String endpointAddress = "http://" + getServerHost() + ":8080/jaxws-jbws2074-usecase4/Service";
QName serviceName = new QName("http://ws.jboss.org/jbws2074", "EJB3Service");
@@ -63,4 +63,30 @@
assertEquals(expStr.toString(), retStr);
}
+ public void testUsecase4WithoutSar() throws Exception
+ {
+ try
+ {
+ deploy("jaxws-jbws2074-usecase4.jar");
+ executeTest();
+ }
+ finally
+ {
+ undeploy("jaxws-jbws2074-usecase4.jar");
+ }
+ }
+
+ public void testUsecase4WithSar() throws Exception
+ {
+ try
+ {
+ deploy("jaxws-jbws2074-usecase4.sar");
+ executeTest();
+ }
+ finally
+ {
+ undeploy("jaxws-jbws2074-usecase4.sar");
+ }
+ }
+
}
Added: framework/trunk/testsuite/test/resources/jaxws/jbws2074/usecase1-sar/META-INF/application.xml
===================================================================
--- framework/trunk/testsuite/test/resources/jaxws/jbws2074/usecase1-sar/META-INF/application.xml (rev 0)
+++ framework/trunk/testsuite/test/resources/jaxws/jbws2074/usecase1-sar/META-INF/application.xml 2009-05-19 09:03:30 UTC (rev 10050)
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<application
+ version="1.4"
+ xmlns="http://java.sun.com/xml/ns/j2ee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/application_1_4.xsd">
+ <display-name>jbws2074 issue</display-name>
+ <module>
+ <web>
+ <web-uri>jaxws-jbws2074-usecase1.war</web-uri>
+ <context-root>/jaxws-jbws2074-usecase1</context-root>
+ </web>
+ </module>
+</application>
Added: framework/trunk/testsuite/test/resources/jaxws/jbws2074/usecase2-sar/META-INF/application.xml
===================================================================
--- framework/trunk/testsuite/test/resources/jaxws/jbws2074/usecase2-sar/META-INF/application.xml (rev 0)
+++ framework/trunk/testsuite/test/resources/jaxws/jbws2074/usecase2-sar/META-INF/application.xml 2009-05-19 09:03:30 UTC (rev 10050)
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<application
+ version="1.4"
+ xmlns="http://java.sun.com/xml/ns/j2ee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/application_1_4.xsd">
+ <display-name>jbws2074 issue</display-name>
+ <module>
+ <java>jaxws-jbws2074-usecase2.jar</java>
+ </module>
+</application>
Added: framework/trunk/testsuite/test/resources/jaxws/jbws2074/usecase3-sar/META-INF/application.xml
===================================================================
--- framework/trunk/testsuite/test/resources/jaxws/jbws2074/usecase3-sar/META-INF/application.xml (rev 0)
+++ framework/trunk/testsuite/test/resources/jaxws/jbws2074/usecase3-sar/META-INF/application.xml 2009-05-19 09:03:30 UTC (rev 10050)
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<application
+ version="1.4"
+ xmlns="http://java.sun.com/xml/ns/j2ee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/application_1_4.xsd">
+ <display-name>jbws2074 issue</display-name>
+ <module>
+ <web>
+ <web-uri>jaxws-jbws2074-usecase3.war</web-uri>
+ <context-root>/jaxws-jbws2074-usecase3</context-root>
+ </web>
+ </module>
+</application>
Added: framework/trunk/testsuite/test/resources/jaxws/jbws2074/usecase4-sar/META-INF/application.xml
===================================================================
--- framework/trunk/testsuite/test/resources/jaxws/jbws2074/usecase4-sar/META-INF/application.xml (rev 0)
+++ framework/trunk/testsuite/test/resources/jaxws/jbws2074/usecase4-sar/META-INF/application.xml 2009-05-19 09:03:30 UTC (rev 10050)
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<application
+ version="1.4"
+ xmlns="http://java.sun.com/xml/ns/j2ee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/application_1_4.xsd">
+ <display-name>jbws2074 issue</display-name>
+ <module>
+ <java>jaxws-jbws2074-usecase4.jar</java>
+ </module>
+</application>
15 years, 10 months
JBossWS SVN: r10049 - in stack/cxf/trunk/modules: server/src/main/java/org/jboss/wsf/stack/cxf and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2009-05-18 07:20:46 -0400 (Mon, 18 May 2009)
New Revision: 10049
Modified:
stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/ServiceObjectFactory.java
stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/CXFServletExt.java
Log:
[JBWS-2629] fixing thread locals
Modified: stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/ServiceObjectFactory.java
===================================================================
--- stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/ServiceObjectFactory.java 2009-05-18 09:52:04 UTC (rev 10048)
+++ stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/ServiceObjectFactory.java 2009-05-18 11:20:46 UTC (rev 10049)
@@ -87,6 +87,8 @@
{
try
{
+ BusFactory.setThreadDefaultBus(null); // cleanup thread locals before constructing Service
+
Reference ref = (Reference)obj;
// Get the target class name
@@ -121,8 +123,6 @@
// Get the URL to the wsdl
URL wsdlURL = serviceRef.getWsdlLocation();
- BusFactory.setThreadDefaultBus(null); // cleanup thread locals before constructing Service
-
// Generic javax.xml.ws.Service
if (serviceClass == Service.class)
{
Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/CXFServletExt.java
===================================================================
--- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/CXFServletExt.java 2009-05-18 09:52:04 UTC (rev 10048)
+++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/CXFServletExt.java 2009-05-18 11:20:46 UTC (rev 10049)
@@ -33,6 +33,7 @@
import javax.servlet.http.HttpServletResponse;
import javax.xml.ws.WebServiceException;
+import org.apache.cxf.BusFactory;
import org.apache.cxf.transport.servlet.CXFServlet;
import org.apache.cxf.transport.servlet.ServletController;
import org.apache.cxf.transport.servlet.ServletTransportFactory;
@@ -129,6 +130,7 @@
{
try
{
+ BusFactory.setThreadDefaultBus(getBus());
EndpointAssociation.setEndpoint(endpoint);
RequestHandler requestHandler = (RequestHandler)endpoint.getRequestHandler();
requestHandler.handleHttpRequest(endpoint, req, res, getServletContext());
@@ -136,6 +138,7 @@
finally
{
EndpointAssociation.removeEndpoint();
+ BusFactory.setThreadDefaultBus(null);
}
}
15 years, 10 months
JBossWS SVN: r10048 - legacy/tags/jbossws-1.2.1.GA_CP05/build.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2009-05-18 05:52:04 -0400 (Mon, 18 May 2009)
New Revision: 10048
Modified:
legacy/tags/jbossws-1.2.1.GA_CP05/build/version.properties
Log:
[JBPAPP-1971] Fixing version properties
Modified: legacy/tags/jbossws-1.2.1.GA_CP05/build/version.properties
===================================================================
--- legacy/tags/jbossws-1.2.1.GA_CP05/build/version.properties 2009-05-18 09:48:41 UTC (rev 10047)
+++ legacy/tags/jbossws-1.2.1.GA_CP05/build/version.properties 2009-05-18 09:52:04 UTC (rev 10048)
@@ -5,8 +5,8 @@
specification.vendor=JBoss (http://www.jboss.org)
specification.version=jbossws-1.2
-version.id=1.2.1.GA_CP
-repository.id=1.2.1.GA_CP
+version.id=1.2.1.GA_CP05
+repository.id=1.2.1.GA_CP05
implementation.title=JBoss Web Services (JBossWS)
implementation.url=http://www.jboss.org/products/jbossws
15 years, 10 months
JBossWS SVN: r10047 - legacy/tags.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2009-05-18 05:48:41 -0400 (Mon, 18 May 2009)
New Revision: 10047
Added:
legacy/tags/jbossws-1.2.1.GA_CP05/
Log:
[JBPAPP-1971] Tagging jbossws-native 1.2.1.GA_CP05
Copied: legacy/tags/jbossws-1.2.1.GA_CP05 (from rev 10046, legacy/branches/jbossws-1.2.1.GA_CP)
15 years, 10 months
JBossWS SVN: r10046 - stack/native/tags/jbossws-native-2.0.1.SP2_CP06.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2009-05-18 04:33:50 -0400 (Mon, 18 May 2009)
New Revision: 10046
Modified:
stack/native/tags/jbossws-native-2.0.1.SP2_CP06/version.properties
Log:
[JBPAPP-1643]Fixing versions
Modified: stack/native/tags/jbossws-native-2.0.1.SP2_CP06/version.properties
===================================================================
--- stack/native/tags/jbossws-native-2.0.1.SP2_CP06/version.properties 2009-05-18 08:09:03 UTC (rev 10045)
+++ stack/native/tags/jbossws-native-2.0.1.SP2_CP06/version.properties 2009-05-18 08:33:50 UTC (rev 10046)
@@ -6,8 +6,8 @@
specification.vendor=JBoss (http://www.jboss.org)
specification.version=jbossws-2.0
-version.id=2.0.1.SP2_CP-SNAPSHOT
-repository.id=2.0.1.SP2_CP-SNAPSHOT
+version.id=2.0.1.SP2_CP06
+repository.id=2.0.1.SP2_CP06
implementation.title=JBoss Web Services - Native
implementation.url=http://www.jboss.org/products/jbossws
@@ -25,9 +25,9 @@
wscommons-policy=1.0
# Dependend integration projects
-jbossws-spi=1.0.0.GA_CP-SNAPSHOT
-jbossws-common=1.0.0.GA_CP-SNAPSHOT
-jbossws-framework=2.0.1.GA_CP-SNAPSHOT
+jbossws-spi=1.0.0.GA_CP02-brew
+jbossws-common=1.0.0.GA_CP04-brew
+jbossws-framework=2.0.1.GA_CP04-brew
jbossws-jboss40=2.0.1.GA
jbossws-jboss42=2.0.1.GA_CP01
15 years, 10 months
JBossWS SVN: r10043 - stack/native/tags.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2009-05-18 03:45:21 -0400 (Mon, 18 May 2009)
New Revision: 10043
Added:
stack/native/tags/jbossws-native-2.0.1.SP2_CP06/
Log:
[JBPAPP-1643] Tagging jbossws native 2.0.1.SP2_CP06
Copied: stack/native/tags/jbossws-native-2.0.1.SP2_CP06 (from rev 10042, stack/native/branches/jbossws-native-2.0.1.SP2_CP)
15 years, 10 months
JBossWS SVN: r10042 - in stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-2010: src/main/java/org/jboss/ws/metadata/umdm and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2009-05-15 08:54:11 -0400 (Fri, 15 May 2009)
New Revision: 10042
Modified:
stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-2010/src/main/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java
stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-2010/version.properties
Log:
[JBPAPP-2010] Correct WeakReference handling in ConfigObservable to remove cleared WeakReferences.
Modified: stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-2010/src/main/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java
===================================================================
--- stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-2010/src/main/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java 2009-05-15 12:02:40 UTC (rev 10041)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-2010/src/main/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java 2009-05-15 12:54:11 UTC (rev 10042)
@@ -23,6 +23,8 @@
// $Id$
+import java.lang.ref.Reference;
+import java.lang.ref.ReferenceQueue;
import java.lang.ref.WeakReference;
import java.lang.reflect.Method;
import java.util.ArrayList;
@@ -803,6 +805,7 @@
class ConfigObservable extends Observable
{
+ private ReferenceQueue<WeakReference<Observer>> queue = new ReferenceQueue<WeakReference<Observer>>();
private List<WeakReference<Observer>> observer = new ArrayList<WeakReference<Observer>>();
public void doNotify(Object object)
@@ -813,15 +816,17 @@
public synchronized void addObserver(Observer o)
{
- observer.add( new WeakReference(o));
+ clearCollected();
+ observer.add(new WeakReference(o, queue));
}
public synchronized void deleteObserver(Observer o)
{
- for(WeakReference<Observer> w : observer)
+ clearCollected();
+ for (WeakReference<Observer> w : observer)
{
Observer tmp = w.get();
- if(tmp.equals(o))
+ if (tmp != null && tmp.equals(o))
{
observer.remove(o);
break;
@@ -837,16 +842,29 @@
public void notifyObservers(Object arg)
{
- if(hasChanged())
+ clearCollected();
+ if (hasChanged())
{
- for(WeakReference<Observer> w : observer)
+ for (WeakReference<Observer> w : observer)
{
Observer tmp = w.get();
- tmp.update(this, arg);
-
+ if (tmp != null)
+ {
+ tmp.update(this, arg);
+ }
}
}
}
+
+ private void clearCollected()
+ {
+ Reference ref;
+ while ((ref = queue.poll()) != null)
+ {
+ observer.remove(ref);
+ }
+
+ }
}
public List<UnifiedPortComponentRefMetaData> getServiceRefContrib()
Modified: stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-2010/version.properties
===================================================================
--- stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-2010/version.properties 2009-05-15 12:02:40 UTC (rev 10041)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-2010/version.properties 2009-05-15 12:54:11 UTC (rev 10042)
@@ -5,8 +5,8 @@
specification.vendor=JBoss (http://www.jboss.org)
specification.version=jbossws-2.0
-version.id=2.0.1.SP2_CP03
-repository.id=2.0.1.SP2_CP03
+version.id=2.0.1.SP2_CP03_JBPAPP-2010
+repository.id=2.0.1.SP2_CP03_JBPAPP-2010
implementation.title=JBoss Web Services - Native
implementation.url=http://www.jboss.org/products/jbossws
15 years, 10 months
JBossWS SVN: r10041 - stack/native/branches.
by jbossws-commits＠lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2009-05-15 08:02:40 -0400 (Fri, 15 May 2009)
New Revision: 10041
Added:
stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-2010/
Log:
[JBPAPP-2010] Branch for patch.
Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-2010 (from rev 10040, stack/native/tags/jbossws-native-2.0.1.SP2_CP03)
15 years, 10 months