Return-Path: Delivered-To: apmail-xml-axis-dev-archive@xml.apache.org Received: (qmail 40371 invoked by uid 500); 4 Nov 2002 16:33:09 -0000 Mailing-List: contact axis-dev-help@xml.apache.org; run by ezmlm Precedence: bulk Reply-To: axis-dev@xml.apache.org list-help: list-unsubscribe: list-post: Delivered-To: mailing list axis-dev@xml.apache.org Received: (qmail 40360 invoked by uid 500); 4 Nov 2002 16:33:09 -0000 Delivered-To: apmail-xml-axis-cvs@apache.org Date: 4 Nov 2002 16:33:07 -0000 Message-ID: <20021104163307.73435.qmail@icarus.apache.org> From: gdaniels@apache.org To: xml-axis-cvs@apache.org Subject: cvs commit: xml-axis/java/src/org/apache/axis/transport/http HTTPSender.java X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N gdaniels 2002/11/04 08:33:07 Modified: java/src/org/apache/axis/providers/java JavaProvider.java java/src/org/apache/axis/transport/http HTTPSender.java Log: Remove redundant casts. Revision Changes Path 1.91 +20 -20 xml-axis/java/src/org/apache/axis/providers/java/JavaProvider.java Index: JavaProvider.java =================================================================== RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/providers/java/JavaProvider.java,v retrieving revision 1.90 retrieving revision 1.91 diff -u -r1.90 -r1.91 --- JavaProvider.java 1 Nov 2002 20:14:57 -0000 1.90 +++ JavaProvider.java 4 Nov 2002 16:33:07 -0000 1.91 @@ -160,7 +160,7 @@ AxisEngine engine = msgContext.getAxisEngine(); Session appSession = engine.getApplicationSession(); if (appSession != null) { - return getSessionServiceObject(appSession, serviceName, + return getSessionServiceObject(appSession, serviceName, msgContext, clsName); } else { // was no application session, sigh, treat as request scope @@ -173,19 +173,19 @@ return null; } } - + /** * Simple utility class for dealing with synchronization issues. - */ + */ class LockObject { private boolean completed = false; - + synchronized void waitUntilComplete() throws InterruptedException { while (!completed) { wait(); } } - + synchronized void complete() { completed = true; notifyAll(); @@ -197,19 +197,19 @@ * issues when multiple threads might be accessing the same session * object, and ensures only one thread gets to create the service * object if there isn't one already. - */ + */ private Object getSessionServiceObject(Session session, String serviceName, MessageContext msgContext, String clsName) throws Exception { Object obj = null; boolean makeNewObject = false; - - // This is a little tricky. + + // This is a little tricky. synchronized (session.getLockObject()) { // store service objects in session, indexed by class name obj = session.get(serviceName); - + // If nothing there, put in a placeholder object so // other threads wait for us to create the real // service object. @@ -217,16 +217,16 @@ obj = new LockObject(); makeNewObject = true; session.set(serviceName, obj); - } + } } - + // OK, we DEFINITELY have something in obj at this point. Either // it's the service object or it's a LockObject (ours or someone // else's). - + if (LockObject.class == obj.getClass()) { LockObject lock = (LockObject)obj; - + // If we were the lucky thread who got to install the // placeholder, create a new service object and install it // instead, then notify anyone waiting on the LockObject. @@ -238,13 +238,13 @@ // It's someone else's LockObject, so wait around until // it's completed. lock.waitUntilComplete(); - + // Now we are guaranteed there is a service object in the // session, so this next part doesn't need syncing obj = session.get(serviceName); } } - + return obj; } @@ -312,7 +312,7 @@ try { serviceObject = getServiceObject(msgContext, service, clsName, scope); - + Message resMsg = msgContext.getResponseMessage(); SOAPEnvelope resEnv; @@ -323,11 +323,11 @@ resMsg = new Message(resEnv); msgContext.setResponseMessage( resMsg ); } else { - resEnv = (SOAPEnvelope)resMsg.getSOAPEnvelope(); + resEnv = resMsg.getSOAPEnvelope(); } Message reqMsg = msgContext.getRequestMessage(); - SOAPEnvelope reqEnv = (SOAPEnvelope)reqMsg.getSOAPEnvelope(); + SOAPEnvelope reqEnv = reqMsg.getSOAPEnvelope(); processMessage(msgContext, reqEnv, resEnv, serviceObject); } @@ -466,7 +466,7 @@ emitter.setServicePortName(wsdlServicePort); } - String wsdlInputSchema = (String) + String wsdlInputSchema = (String) service.getOption(OPTION_WSDL_INPUTSCHEMA); if (null != wsdlInputSchema && wsdlInputSchema.length() > 0) { emitter.setInputSchema(wsdlInputSchema); @@ -555,7 +555,7 @@ } else { cl = Thread.currentThread().getContextClassLoader(); } - + // If we have an engine, use its class cache if (engine != null) { ClassCache cache = engine.getClassCache(); 1.91 +1 -2 xml-axis/java/src/org/apache/axis/transport/http/HTTPSender.java Index: HTTPSender.java =================================================================== RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/transport/http/HTTPSender.java,v retrieving revision 1.90 retrieving revision 1.91 diff -u -r1.90 -r1.91 --- HTTPSender.java 16 Oct 2002 15:09:37 -0000 1.90 +++ HTTPSender.java 4 Nov 2002 16:33:07 -0000 1.91 @@ -55,7 +55,6 @@ package org.apache.axis.transport.http; import org.apache.axis.AxisFault; -import org.apache.axis.Constants; import org.apache.axis.Message; import org.apache.axis.MessageContext; import org.apache.axis.soap.SOAP12Constants; @@ -665,7 +664,7 @@ } log.debug("\n" + Messages.getMessage("xmlRecd00")); log.debug("-----------------------------------------------"); - log.debug((String) outMsg.getSOAPPartAsString()); + log.debug(outMsg.getSOAPPartAsString()); } // if we are maintaining session state,