[jbossws-commits] JBossWS SVN: r1394 - in branches/jbossws-1.0/src/main/java/org/jboss/ws: deployment metadata

Author: thomas.diesler(a)jboss.com Date: 2006-11-05 16:04:29 -0500 (Sun, 05 Nov 2006) New Revision: 1394 Modified: branches/jbossws-1.0/src/main/java/org/jboss/ws/deployment/JSR109ServerMetaDataBuilder.java branches/jbossws-1.0/src/main/java/org/jboss/ws/metadata/EndpointMetaData.java branches/jbossws-1.0/src/main/java/org/jboss/ws/metadata/OperationMetaData.java branches/jbossws-1.0/src/main/java/org/jboss/ws/metadata/UnifiedMetaData.java Log: Fix opMetaData initialization when SEI mapping was not found. Modified: branches/jbossws-1.0/src/main/java/org/jboss/ws/deployment/JSR109ServerMetaDataBuilder.java =================================================================== --- branches/jbossws-1.0/src/main/java/org/jboss/ws/deployment/JSR109ServerMetaDataBuilder.java 2006-11-05 19:10:40 UTC (rev 1393) +++ branches/jbossws-1.0/src/main/java/org/jboss/ws/deployment/JSR109ServerMetaDataBuilder.java 2006-11-05 21:04:29 UTC (rev 1394) @@ -334,7 +334,6 @@ protected void initTransportGuaranteeJSE(UnifiedDeploymentInfo udi, EndpointMetaData epMetaData, String servletLink) throws IOException { UnifiedWebMetaData webMetaData = (UnifiedWebMetaData)udi.metaData; - epMetaData.setTransportGuarantee(getTransportGuarantee(webMetaData, servletLink)); } } Modified: branches/jbossws-1.0/src/main/java/org/jboss/ws/metadata/EndpointMetaData.java =================================================================== --- branches/jbossws-1.0/src/main/java/org/jboss/ws/metadata/EndpointMetaData.java 2006-11-05 19:10:40 UTC (rev 1393) +++ branches/jbossws-1.0/src/main/java/org/jboss/ws/metadata/EndpointMetaData.java 2006-11-05 21:04:29 UTC (rev 1394) @@ -176,6 +176,10 @@ public void setServiceEndpointInterfaceName(String seiName) { + UnifiedMetaData wsMetaData = serviceMetaData.getUnifiedMetaData(); + if (wsMetaData.isEagerInitialized() && UnifiedMetaData.isFinalRelease() == false) + log.warn("Set SEI name after eager initialization", new IllegalStateException()); + this.seiName = seiName; this.seiClass = null; } @@ -370,6 +374,12 @@ public OperationMetaData getOperation(Method method) { + if (opMetaDataCache.size() == 0) + { + // This can happen when the SEI mapping was not found + log.warn("Access to empty operation meta data cache, reinitializing"); + initializeInternal(); + } OperationMetaData opMetaData = opMetaDataCache.get(method); return opMetaData; } @@ -435,6 +445,11 @@ */ public void eagerInitialize() { + initializeInternal(); + } + + private void initializeInternal() + { // Initialize handlers for (HandlerMetaData handler : handlers) handler.eagerInitialize(); Modified: branches/jbossws-1.0/src/main/java/org/jboss/ws/metadata/OperationMetaData.java =================================================================== --- branches/jbossws-1.0/src/main/java/org/jboss/ws/metadata/OperationMetaData.java 2006-11-05 19:10:40 UTC (rev 1393) +++ branches/jbossws-1.0/src/main/java/org/jboss/ws/metadata/OperationMetaData.java 2006-11-05 21:04:29 UTC (rev 1394) @@ -246,8 +246,8 @@ } } - // if (log.isTraceEnabled()) - log.debug("Synchronized java method:\n" + method + "\nwith: " + toString()); + if (log.isTraceEnabled()) + log.trace("Synchronized java method:\n" + method + "\nwith: " + toString()); return isJavaMethod; } Modified: branches/jbossws-1.0/src/main/java/org/jboss/ws/metadata/UnifiedMetaData.java =================================================================== --- branches/jbossws-1.0/src/main/java/org/jboss/ws/metadata/UnifiedMetaData.java 2006-11-05 19:10:40 UTC (rev 1393) +++ branches/jbossws-1.0/src/main/java/org/jboss/ws/metadata/UnifiedMetaData.java 2006-11-05 21:04:29 UTC (rev 1394) @@ -30,6 +30,7 @@ import java.util.Map; import java.util.StringTokenizer; +import org.jboss.logging.Logger; import org.jboss.ws.metadata.jaxrpcmapping.JavaWsdlMapping; import org.jboss.ws.metadata.wsdl.WSDLDefinitions; import org.jboss.ws.server.ServiceEndpointManager; @@ -50,6 +51,9 @@ */ public class UnifiedMetaData { + // provide logging + private static Logger log = Logger.getLogger(UnifiedMetaData.class); + // The modules resource class loader private URLClassLoader resourceLoader; // The modules class loader @@ -173,6 +177,7 @@ { if (eagerInitialized == false) { + log.debug("Eagerly initialize the meta data model"); for (ServiceMetaData service : services) { service.eagerInitialize();