From d84fd9ddc59c17fb0f3215bd723914b244f95337 Mon Sep 17 00:00:00 2001 From: markt Date: Sat, 13 Feb 2010 11:02:23 +0000 Subject: [PATCH] Change a few variable names to reduce potential confusion - no functional change git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@909789 13f79535-47bb-0310-9956-ffa450edef68 --- .../factory/webservices/ServiceRefFactory.java | 54 +++++++++++----------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/java/org/apache/naming/factory/webservices/ServiceRefFactory.java b/java/org/apache/naming/factory/webservices/ServiceRefFactory.java index 4c82aab69..e28cb1e29 100644 --- a/java/org/apache/naming/factory/webservices/ServiceRefFactory.java +++ b/java/org/apache/naming/factory/webservices/ServiceRefFactory.java @@ -257,11 +257,11 @@ public class ServiceRefFactory ArrayList soaproles = new ArrayList(); while (((ServiceRef) ref).getHandlersSize() > 0) { - HandlerRef handler = ((ServiceRef) ref).getHandler(); - HandlerInfo handlerref = new HandlerInfo(); + HandlerRef handlerRef = ((ServiceRef) ref).getHandler(); + HandlerInfo handlerInfo = new HandlerInfo(); // Loading handler Class - tmp = handler.get(HandlerRef.HANDLER_CLASS); + tmp = handlerRef.get(HandlerRef.HANDLER_CLASS); if ((tmp == null) || (tmp.getContent() == null)) break; Class handlerClass = null; @@ -276,51 +276,51 @@ public class ServiceRefFactory ArrayList headers = new ArrayList(); Hashtable config = new Hashtable(); ArrayList portNames = new ArrayList(); - for (int i = 0; i < handler.size(); i++) - if (HandlerRef.HANDLER_LOCALPART.equals(handler.get(i).getType())) { + for (int i = 0; i < handlerRef.size(); i++) + if (HandlerRef.HANDLER_LOCALPART.equals(handlerRef.get(i).getType())) { String localpart = ""; String namespace = ""; - localpart = (String) handler.get(i).getContent(); - if (HandlerRef.HANDLER_NAMESPACE.equals(handler.get(i + 1).getType())) { + localpart = (String) handlerRef.get(i).getContent(); + if (HandlerRef.HANDLER_NAMESPACE.equals(handlerRef.get(i + 1).getType())) { i++; - namespace = (String) handler.get(i).getContent(); + namespace = (String) handlerRef.get(i).getContent(); } QName header = new QName(namespace, localpart); headers.add(header); - } else if (HandlerRef.HANDLER_PARAMNAME.equals(handler.get(i).getType())) { + } else if (HandlerRef.HANDLER_PARAMNAME.equals(handlerRef.get(i).getType())) { String paramName = ""; String paramValue = ""; - paramName = (String) handler.get(i).getContent(); - if (HandlerRef.HANDLER_PARAMVALUE.equals(handler.get(i + 1).getType())) { + paramName = (String) handlerRef.get(i).getContent(); + if (HandlerRef.HANDLER_PARAMVALUE.equals(handlerRef.get(i + 1).getType())) { i++; - paramValue = (String) handler.get(i).getContent(); + paramValue = (String) handlerRef.get(i).getContent(); } config.put(paramName, paramValue); - } else if (HandlerRef.HANDLER_SOAPROLE.equals(handler.get(i).getType())) { + } else if (HandlerRef.HANDLER_SOAPROLE.equals(handlerRef.get(i).getType())) { String soaprole = ""; - soaprole = (String) handler.get(i).getContent(); + soaprole = (String) handlerRef.get(i).getContent(); soaproles.add(soaprole); - } else if (HandlerRef.HANDLER_PORTNAME.equals(handler.get(i).getType())) { + } else if (HandlerRef.HANDLER_PORTNAME.equals(handlerRef.get(i).getType())) { String portName = ""; - portName = (String) handler.get(i).getContent(); + portName = (String) handlerRef.get(i).getContent(); portNames.add(portName); } // Set the handlers informations - handlerref.setHandlerClass(handlerClass); - handlerref.setHeaders(headers.toArray(new QName[headers.size()])); - handlerref.setHandlerConfig(config); + handlerInfo.setHandlerClass(handlerClass); + handlerInfo.setHeaders(headers.toArray(new QName[headers.size()])); + handlerInfo.setHandlerConfig(config); if (!portNames.isEmpty()) { Iterator iter = portNames.iterator(); while (iter.hasNext()) initHandlerChain(new QName(iter.next()), handlerRegistry, - handlerref, soaproles); + handlerInfo, soaproles); } else { Enumeration e = portComponentRef.elements(); while(e.hasMoreElements()) initHandlerChain(e.nextElement(), handlerRegistry, - handlerref, soaproles); + handlerInfo, soaproles); } } } @@ -353,18 +353,18 @@ public class ServiceRefFactory private void initHandlerChain(QName portName, HandlerRegistry handlerRegistry, - HandlerInfo handlerref, ArrayList soaprolesToAdd) { - HandlerChain handlerList = (HandlerChain) handlerRegistry.getHandlerChain(portName); - handlerList.add(handlerref); - String[] soaprolesRegistered = handlerList.getRoles(); + HandlerInfo handlerInfo, ArrayList soaprolesToAdd) { + HandlerChain handlerChain = (HandlerChain) handlerRegistry.getHandlerChain(portName); + handlerChain.add(handlerInfo); + String[] soaprolesRegistered = handlerChain.getRoles(); String [] soaproles = new String[soaprolesRegistered.length + soaprolesToAdd.size()]; int i; for (i = 0;i < soaprolesRegistered.length; i++) soaproles[i] = soaprolesRegistered[i]; for (int j = 0; j < soaprolesToAdd.size(); j++) soaproles[i+j] = soaprolesToAdd.get(j); - handlerList.setRoles(soaproles); - handlerRegistry.setHandlerChain(portName, handlerList); + handlerChain.setRoles(soaproles); + handlerRegistry.setHandlerChain(portName, handlerChain); } -- 2.11.0