[jbossws-commits] JBossWS SVN: r2247 - in branches/jbossws-1.2.0: jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1190 and 1 other directories.

Author: thomas.diesler(a)jboss.com Date: 2007-02-02 04:13:22 -0500 (Fri, 02 Feb 2007) New Revision: 2247 Modified: branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/ServiceMetaData.java branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1190/JBWS1190TestCase.java branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jbws1190/JBWS1190TestCase.java Log: Make wsdl cache key constant Modified: branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/ServiceMetaData.java =================================================================== --- branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/ServiceMetaData.java 2007-02-02 00:55:22 UTC (rev 2246) +++ branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/ServiceMetaData.java 2007-02-02 09:13:22 UTC (rev 2247) @@ -86,13 +86,16 @@ // Arbitrary properties given by <call-property> private Properties properties; - + // derived cached encoding style private Use encStyle; - + // The security configuration private WSSecurityConfiguration securityConfig; - + + // The key to the wsdl cache + private String wsdlCacheKey; + public ServiceMetaData(UnifiedMetaData wsMetaData, QName serviceName) { this.wsMetaData = wsMetaData; @@ -299,13 +302,19 @@ WSDLDefinitions wsdlDefinitions = null; if (wsdlURL != null) { - String wsdlKey = wsMetaData.getDeploymentName() + getServiceName(); - wsdlDefinitions = (WSDLDefinitions)wsMetaData.getWsdlDefinition(wsdlKey); + // The key should not after it is assigned + if (wsdlCacheKey == null) + { + String deploymentName = wsMetaData.getDeploymentName(); + wsdlCacheKey = deploymentName + "/" + (wsdlLocation != null ? wsdlLocation : wsdlFile); + } + + wsdlDefinitions = (WSDLDefinitions)wsMetaData.getWsdlDefinition(wsdlCacheKey); if (wsdlDefinitions == null) { WSDLDefinitionsFactory factory = WSDLDefinitionsFactory.newInstance(); wsdlDefinitions = factory.parse(wsdlURL); - wsMetaData.addWsdlDefinition(wsdlKey, wsdlDefinitions); + wsMetaData.addWsdlDefinition(wsdlCacheKey, wsdlDefinitions); } } return wsdlDefinitions; Modified: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1190/JBWS1190TestCase.java =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1190/JBWS1190TestCase.java 2007-02-02 00:55:22 UTC (rev 2246) +++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1190/JBWS1190TestCase.java 2007-02-02 09:13:22 UTC (rev 2247) @@ -30,7 +30,7 @@ import org.jboss.test.ws.JBossWSTestSetup; /** - * [JBWS-1190] WSDL generated for JSR-181 POJO does not take 'transport-guarantee' in web.xml into account + * WSDL generated for JSR-181 POJO does not take 'transport-guarantee' in web.xml into account * * http://jira.jboss.org/jira/browse/JBWS-1190 * Modified: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jbws1190/JBWS1190TestCase.java =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jbws1190/JBWS1190TestCase.java 2007-02-02 00:55:22 UTC (rev 2246) +++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jbws1190/JBWS1190TestCase.java 2007-02-02 09:13:22 UTC (rev 2247) @@ -32,7 +32,7 @@ import org.jboss.test.ws.JBossWSTestSetup; /** - * [JBWS-1190] WSDL generated for JSR-181 POJO does not take 'transport-guarantee' in web.xml into account + * WSDL generated for JSR-181 POJO does not take 'transport-guarantee' in web.xml into account * * http://jira.jboss.org/jira/browse/JBWS-1190 *