From cvs-return-33218-apmail-cocoon-cvs-archive=cocoon.apache.org@cocoon.apache.org Thu Apr 17 03:19:20 2008 Return-Path: Delivered-To: apmail-cocoon-cvs-archive@www.apache.org Received: (qmail 32479 invoked from network); 17 Apr 2008 03:19:19 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 17 Apr 2008 03:19:19 -0000 Received: (qmail 49412 invoked by uid 500); 17 Apr 2008 03:19:20 -0000 Delivered-To: apmail-cocoon-cvs-archive@cocoon.apache.org Received: (qmail 49354 invoked by uid 500); 17 Apr 2008 03:19:20 -0000 Mailing-List: contact cvs-help@cocoon.apache.org; run by ezmlm Precedence: bulk Reply-To: dev@cocoon.apache.org list-help: list-unsubscribe: List-Post: List-Id: Delivered-To: mailing list cvs@cocoon.apache.org Received: (qmail 49343 invoked by uid 99); 17 Apr 2008 03:19:20 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 16 Apr 2008 20:19:20 -0700 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 17 Apr 2008 03:18:45 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 9BFDD1A9832; Wed, 16 Apr 2008 20:18:58 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r648939 - in /cocoon/branches/BRANCH_2_1_X/src: blocks/portal/java/org/apache/cocoon/portlet/multipart/MultipartActionRequest.java java/org/apache/cocoon/servlet/multipart/MultipartHttpServletRequest.java Date: Thu, 17 Apr 2008 03:18:57 -0000 To: cvs@cocoon.apache.org From: joerg@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20080417031858.9BFDD1A9832@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: joerg Date: Wed Apr 16 20:18:56 2008 New Revision: 648939 URL: http://svn.apache.org/viewvc?rev=648939&view=rev Log: fix whitespace Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portlet/multipart/MultipartActionRequest.java cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/servlet/multipart/MultipartHttpServletRequest.java Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portlet/multipart/MultipartActionRequest.java URL: http://svn.apache.org/viewvc/cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portlet/multipart/MultipartActionRequest.java?rev=648939&r1=648938&r2=648939&view=diff ============================================================================== --- cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portlet/multipart/MultipartActionRequest.java (original) +++ cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portlet/multipart/MultipartActionRequest.java Wed Apr 16 20:18:56 2008 @@ -87,7 +87,7 @@ if (result instanceof Vector) { Vector v = (Vector) result; - if (v.size() == 1) { + if (v.size() == 1) { return v.elementAt(0); } else { return v; @@ -100,15 +100,15 @@ String[] array = request.getParameterValues(name); if (array != null) { - if (array.length == 1) { - result = array[0]; - } else { + if (array.length == 1) { + result = array[0]; + } else { Vector vec = new Vector(); for (int i = 0; i < array.length; i++) { vec.addElement(array[i]); } result = vec; - } + } } } @@ -152,21 +152,21 @@ * @param name */ public String[] getParameterValues(String name) { - // null check and so else path are just optimizations + // null check and so else path are just optimizations if (values != null) { Object value = get(name); if (value == null) { - return null; + return null; } else if (value instanceof Vector) { - Vector v = (Vector)value; - String[] results = new String[v.size()]; - for (int i = 0; i < v.size(); i++) { - results[i] = v.elementAt(i).toString(); - } - return results; + Vector v = (Vector)value; + String[] results = new String[v.size()]; + for (int i = 0; i < v.size(); i++) { + results[i] = v.elementAt(i).toString(); + } + return results; } else { - return new String[]{value.toString()}; + return new String[]{value.toString()}; } } else { return request.getParameterValues(name); Modified: cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/servlet/multipart/MultipartHttpServletRequest.java URL: http://svn.apache.org/viewvc/cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/servlet/multipart/MultipartHttpServletRequest.java?rev=648939&r1=648938&r2=648939&view=diff ============================================================================== --- cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/servlet/multipart/MultipartHttpServletRequest.java (original) +++ cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/servlet/multipart/MultipartHttpServletRequest.java Wed Apr 16 20:18:56 2008 @@ -85,22 +85,22 @@ if (result instanceof Vector) { Vector v = (Vector) result; - if (v.size() == 1) { + if (v.size() == 1) { return v.elementAt(0); } - return result; + return v; } } else { String[] array = request.getParameterValues(name); if (array != null) { - if (array.length == 1) { - result = array[0]; - } else { - Vector vec = new Vector(); - for (int i = 0; i < array.length; i++) { - vec.addElement(array[i]); - } + if (array.length == 1) { + result = array[0]; + } else { + Vector vec = new Vector(); + for (int i = 0; i < array.length; i++) { + vec.addElement(array[i]); + } result = vec; } } @@ -146,7 +146,7 @@ * @param name */ public String[] getParameterValues(String name) { - // null check and so else path are just optimizations + // null check and so else path are just optimizations if (values != null) { Object value = get(name); @@ -154,7 +154,7 @@ return null; } else if (value instanceof Vector) { Vector v = (Vector)value; - String[] results = new String[v.size()]; + String[] results = new String[v.size()]; for (int i = 0; i < v.size(); i++) { results[i] = v.elementAt(i).toString(); }