stevel 2003/01/25 11:36:36
Modified: java/src/org/apache/axis/encoding/ser ArraySerializer.java
java/src/org/apache/axis/client AxisClient.java
Log:
more tabs to spaces; cvs is playing up and wont bulk commit.
Revision Changes Path
1.46 +6 -5
xml-axis/java/src/org/apache/axis/encoding/ser/ArraySerializer.java
Index: ArraySerializer.java
===================================================================
RCS file:
/home/cvs/xml-axis/java/src/org/apache/axis/encoding/ser/ArraySerializer.java,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- ArraySerializer.java 20 Dec 2002 17:28:20 -0000 1.45
+++ ArraySerializer.java 25 Jan 2003 19:36:36 -0000 1.46
@@ -208,12 +208,13 @@
// Check the message context to see if we should turn 2D processing ON
// Default is OFF
- boolean enable2Dim = false;
-
- // Vidyanand : added this check
- if( msgContext != null )
- enable2Dim =
+ boolean enable2Dim = false;
+
+ // Vidyanand : added this check
+ if( msgContext != null ) {
+ enable2Dim =
JavaUtils.isTrueExplicitly(msgContext.getAxisEngine().getOption(AxisEngine.PROP_TWOD_ARRAY_ENCODING));
+ }
int dim2Len = -1;
if (enable2Dim && !dims.equals("")) {
1.60 +22 -22 xml-axis/java/src/org/apache/axis/client/AxisClient.java
Index: AxisClient.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/client/AxisClient.java,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- AxisClient.java 11 Dec 2002 22:38:09 -0000 1.59
+++ AxisClient.java 25 Jan 2003 19:36:36 -0000 1.60
@@ -220,9 +220,9 @@
}
protected void invokeJAXRPCHandlers(MessageContext context){
- java.util.List chain = null;
- HandlerInfoChainFactory hiChainFactory = null;
- boolean clientSpecified = false;
+ java.util.List chain = null;
+ HandlerInfoChainFactory hiChainFactory = null;
+ boolean clientSpecified = false;
Service service
= (Service)context.getProperty(Call.WSDL_SERVICE);
@@ -238,28 +238,28 @@
javax.xml.rpc.handler.HandlerRegistry registry;
registry = service.getHandlerRegistry();
if(registry != null) {
- chain = registry.getHandlerChain(portName);
- if ((chain != null) && (!chain.isEmpty())) {
- hiChainFactory = new HandlerInfoChainFactory(chain);
- clientSpecified = true;
- }
+ chain = registry.getHandlerChain(portName);
+ if ((chain != null) && (!chain.isEmpty())) {
+ hiChainFactory = new HandlerInfoChainFactory(chain);
+ clientSpecified = true;
+ }
}
- // Otherwise, use the container support
- if (!clientSpecified) {
- SOAPService soapService = context.getService();
- if (soapService != null) {
- // A client configuration exists for this service. Check
- // to see if there is a HandlerInfoChain configured on it.
- hiChainFactory = (HandlerInfoChainFactory)
- soapService.getOption(Constants.ATTR_HANDLERINFOCHAIN);
- }
- }
+ // Otherwise, use the container support
+ if (!clientSpecified) {
+ SOAPService soapService = context.getService();
+ if (soapService != null) {
+ // A client configuration exists for this service. Check
+ // to see if there is a HandlerInfoChain configured on it.
+ hiChainFactory = (HandlerInfoChainFactory)
+ soapService.getOption(Constants.ATTR_HANDLERINFOCHAIN);
+ }
+ }
- if (hiChainFactory == null) {
- return;
- }
- HandlerChainImpl impl = (HandlerChainImpl) hiChainFactory.createHandlerChain();
+ if (hiChainFactory == null) {
+ return;
+ }
+ HandlerChainImpl impl = (HandlerChainImpl) hiChainFactory.createHandlerChain();
if(!context.getPastPivot()) {
impl.handleRequest(context);
