Return-Path: X-Original-To: apmail-labs-commits-archive@minotaur.apache.org Delivered-To: apmail-labs-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id BB8B76DB9 for ; Wed, 22 Jun 2011 17:30:22 +0000 (UTC) Received: (qmail 38591 invoked by uid 500); 22 Jun 2011 17:30:22 -0000 Delivered-To: apmail-labs-commits-archive@labs.apache.org Received: (qmail 38484 invoked by uid 500); 22 Jun 2011 17:30:21 -0000 Mailing-List: contact commits-help@labs.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: labs@labs.apache.org Delivered-To: mailing list commits@labs.apache.org Received: (qmail 38477 invoked by uid 99); 22 Jun 2011 17:30:21 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 22 Jun 2011 17:30:21 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 22 Jun 2011 17:30:20 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id A16622388A3D; Wed, 22 Jun 2011 17:30:00 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1138560 - /labs/magma/trunk/foundation-website/src/main/java/org/apache/magma/website/WebHandler.java Date: Wed, 22 Jun 2011 17:30:00 -0000 To: commits@labs.apache.org From: simoneg@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110622173000.A16622388A3D@eris.apache.org> Author: simoneg Date: Wed Jun 22 17:30:00 2011 New Revision: 1138560 URL: http://svn.apache.org/viewvc?rev=1138560&view=rev Log: Fix on empty parameters in url Modified: labs/magma/trunk/foundation-website/src/main/java/org/apache/magma/website/WebHandler.java Modified: labs/magma/trunk/foundation-website/src/main/java/org/apache/magma/website/WebHandler.java URL: http://svn.apache.org/viewvc/labs/magma/trunk/foundation-website/src/main/java/org/apache/magma/website/WebHandler.java?rev=1138560&r1=1138559&r2=1138560&view=diff ============================================================================== --- labs/magma/trunk/foundation-website/src/main/java/org/apache/magma/website/WebHandler.java (original) +++ labs/magma/trunk/foundation-website/src/main/java/org/apache/magma/website/WebHandler.java Wed Jun 22 17:30:00 2011 @@ -98,12 +98,23 @@ public class WebHandler implements Templ if (pathInfo == null) { info = new String[] { "" }; } else { + /* + * This way led to errors with empty parameters not being considered StringTokenizer stok = new StringTokenizer(pathInfo, "/" + paramSeparator); info = new String[stok.countTokens()]; int pos = 0; while (stok.hasMoreTokens()) { info[pos++] = stok.nextToken(); } + */ + if (pathInfo.startsWith("/")) pathInfo = pathInfo.substring(1); + info = pathInfo.split("[\\Q/" + paramSeparator + "\\E]"); + if (pathInfo.endsWith(paramSeparator + "")) { + String[] ninfo = new String[info.length + 1]; + System.arraycopy(info, 0, ninfo, 0, info.length); + ninfo[info.length] = ""; + info = ninfo; + } } return info; } --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscribe@labs.apache.org For additional commands, e-mail: commits-help@labs.apache.org