[jbossws-commits] JBossWS SVN: r7152 - container/jboss50/branches/jbossws-jboss500/src/main/java/org/jboss/wsf/container/jboss50/transport.

Author: richard.opalka(a)jboss.com Date: 2008-05-23 12:01:54 -0400 (Fri, 23 May 2008) New Revision: 7152 Modified: container/jboss50/branches/jbossws-jboss500/src/main/java/org/jboss/wsf/container/jboss50/transport/EJBHttpTransportManager.java container/jboss50/branches/jbossws-jboss500/src/main/java/org/jboss/wsf/container/jboss50/transport/EndpointAPIHttpTransportManager.java Log: fix memory leak - always unregister listener, log undeployment errors Modified: container/jboss50/branches/jbossws-jboss500/src/main/java/org/jboss/wsf/container/jboss50/transport/EJBHttpTransportManager.java =================================================================== --- container/jboss50/branches/jbossws-jboss500/src/main/java/org/jboss/wsf/container/jboss50/transport/EJBHttpTransportManager.java 2008-05-23 12:34:04 UTC (rev 7151) +++ container/jboss50/branches/jbossws-jboss500/src/main/java/org/jboss/wsf/container/jboss50/transport/EJBHttpTransportManager.java 2008-05-23 16:01:54 UTC (rev 7152) @@ -21,6 +21,7 @@ */ package org.jboss.wsf.container.jboss50.transport; +import org.jboss.logging.Logger; import org.jboss.wsf.framework.transport.HttpListenerRef; import org.jboss.wsf.spi.SPIProvider; import org.jboss.wsf.spi.SPIProviderResolver; @@ -46,6 +47,7 @@ */ public class EJBHttpTransportManager implements TransportManager { + private static Logger log = Logger.getLogger(EJBHttpTransportManager.class); private static final String PROCESSED_BY_DEPLOYMENT_FACTORY = "processed.by.deployment.factory"; private WebAppDeploymentFactory deploymentFactory; private WebAppGenerator generator; @@ -117,13 +119,14 @@ { deploymentFactory.destroy(dep); } - finally + catch (Exception e) { - deploymentRegistry.remove(ref.getUUID()); + log.error(e.getMessage(), e); } dep.removeProperty(PROCESSED_BY_DEPLOYMENT_FACTORY); } } + deploymentRegistry.remove(ref.getUUID()); } public void setDeploymentFactory(WebAppDeploymentFactory deploymentFactory) Modified: container/jboss50/branches/jbossws-jboss500/src/main/java/org/jboss/wsf/container/jboss50/transport/EndpointAPIHttpTransportManager.java =================================================================== --- container/jboss50/branches/jbossws-jboss500/src/main/java/org/jboss/wsf/container/jboss50/transport/EndpointAPIHttpTransportManager.java 2008-05-23 12:34:04 UTC (rev 7151) +++ container/jboss50/branches/jbossws-jboss500/src/main/java/org/jboss/wsf/container/jboss50/transport/EndpointAPIHttpTransportManager.java 2008-05-23 16:01:54 UTC (rev 7152) @@ -21,6 +21,7 @@ */ package org.jboss.wsf.container.jboss50.transport; +import org.jboss.logging.Logger; import org.jboss.wsf.framework.transport.HttpListenerRef; import org.jboss.wsf.spi.SPIProvider; import org.jboss.wsf.spi.SPIProviderResolver; @@ -44,6 +45,7 @@ */ public class EndpointAPIHttpTransportManager implements TransportManager { + private static Logger log = Logger.getLogger(EndpointAPIHttpTransportManager.class); private static final String PROCESSED_BY_DEPLOYMENT_FACTORY = "processed.by.deployment.factory"; private WebAppDeploymentFactory deploymentFactory; private WebAppGenerator generator; @@ -83,7 +85,7 @@ { String ctx = httpSpec.getWebContext(); String pattern = httpSpec.getUrlPattern(); - listenerRef = new HttpListenerRef( ctx, pattern, new URI("http://"+hostAndPort+ctx+pattern) ); + listenerRef = new HttpListenerRef(ctx, pattern, new URI("http://" + hostAndPort + ctx + pattern)); } catch (URISyntaxException e) { @@ -109,13 +111,14 @@ { deploymentFactory.destroy(dep); } - finally + catch (Exception e) { - deploymentRegistry.remove(ref.getUUID()); + log.error(e.getMessage(), e); } dep.removeProperty(PROCESSED_BY_DEPLOYMENT_FACTORY); } } + deploymentRegistry.remove(ref.getUUID()); } public void setDeploymentFactory(WebAppDeploymentFactory deploymentFactory)