You are viewing a plain text version of this content. The canonical link for it is here.
Posted to axis-cvs@ws.apache.org by to...@apache.org on 2005/10/28 22:32:52 UTC

svn commit: r329286 - in /webservices/axis/trunk/java/src/org/apache/axis: transport/http/QSMethodHandler.java utils/ByteArrayOutputStream.java

Author: tomj
Date: Fri Oct 28 13:32:49 2005
New Revision: 329286

URL: http://svn.apache.org/viewcvs?rev=329286&view=rev
Log:
Remove use of variable name 'enum' to avoid Java 5 problems.
Fix "C style" array notation noted by jikes.

Modified:
    webservices/axis/trunk/java/src/org/apache/axis/transport/http/QSMethodHandler.java
    webservices/axis/trunk/java/src/org/apache/axis/utils/ByteArrayOutputStream.java

Modified: webservices/axis/trunk/java/src/org/apache/axis/transport/http/QSMethodHandler.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/src/org/apache/axis/transport/http/QSMethodHandler.java?rev=329286&r1=329285&r2=329286&view=diff
==============================================================================
--- webservices/axis/trunk/java/src/org/apache/axis/transport/http/QSMethodHandler.java (original)
+++ webservices/axis/trunk/java/src/org/apache/axis/transport/http/QSMethodHandler.java Fri Oct 28 13:32:49 2005
@@ -16,19 +16,18 @@
 
 package org.apache.axis.transport.http;
 
-import java.io.ByteArrayInputStream;
-import java.io.PrintWriter;
-import java.util.Enumeration;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
 import org.apache.axis.AxisFault;
 import org.apache.axis.Message;
 import org.apache.axis.MessageContext;
 import org.apache.axis.server.AxisServer;
 import org.apache.axis.utils.Messages;
 
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.ByteArrayInputStream;
+import java.io.PrintWriter;
+import java.util.Enumeration;
+
 /**
  * The QSMethodHandler class is a handler which executes a given method from an
  * an AXIS service's WSDL definition when the query string "method" is
@@ -67,10 +66,10 @@
 
         String method = null;
         String args = "";
-        Enumeration enum = request.getParameterNames();
+        Enumeration e = request.getParameterNames();
 
-        while (enum.hasMoreElements()) {
-            String param = (String) enum.nextElement();
+        while (e.hasMoreElements()) {
+            String param = (String) e.nextElement();
             if (param.equalsIgnoreCase ("method")) {
                 method = request.getParameter (param);
             }

Modified: webservices/axis/trunk/java/src/org/apache/axis/utils/ByteArrayOutputStream.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/src/org/apache/axis/utils/ByteArrayOutputStream.java?rev=329286&r1=329285&r2=329286&view=diff
==============================================================================
--- webservices/axis/trunk/java/src/org/apache/axis/utils/ByteArrayOutputStream.java (original)
+++ webservices/axis/trunk/java/src/org/apache/axis/utils/ByteArrayOutputStream.java Fri Oct 28 13:32:49 2005
@@ -189,10 +189,10 @@
     /**
      * @see java.io.ByteArrayOutputStream#toByteArray()
      */
-    public synchronized byte toByteArray()[] {
+    public synchronized byte[] toByteArray() {
         int remaining = count;
         int pos = 0;
-        byte newbuf[] = new byte[count];
+        byte[] newbuf = new byte[count];
         for (int i = 0; i < buffers.size(); i++) {
             byte[] buf = getBuffer(i);
             int c = Math.min(buf.length, remaining);