Return-Path: Delivered-To: apmail-incubator-abdera-commits-archive@locus.apache.org Received: (qmail 1413 invoked from network); 19 Aug 2006 15:36:58 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 19 Aug 2006 15:36:58 -0000 Received: (qmail 53106 invoked by uid 500); 19 Aug 2006 15:36:58 -0000 Delivered-To: apmail-incubator-abdera-commits-archive@incubator.apache.org Received: (qmail 53098 invoked by uid 500); 19 Aug 2006 15:36:58 -0000 Mailing-List: contact abdera-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: abdera-dev@incubator.apache.org Delivered-To: mailing list abdera-commits@incubator.apache.org Received: (qmail 53084 invoked by uid 99); 19 Aug 2006 15:36:58 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 19 Aug 2006 08:36:58 -0700 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received-SPF: pass (asf.osuosl.org: local policy) Received: from [140.211.166.113] (HELO eris.apache.org) (140.211.166.113) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 19 Aug 2006 08:36:58 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id 07A911A981A; Sat, 19 Aug 2006 08:36:38 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r432839 - in /incubator/abdera/java/trunk: parser/src/main/java/org/apache/abdera/parser/stax/FOMXPath.java server/src/main/java/org/apache/abdera/server/servlet/AbderaServlet.java Date: Sat, 19 Aug 2006 15:36:37 -0000 To: abdera-commits@incubator.apache.org From: rooneg@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20060819153638.07A911A981A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: rooneg Date: Sat Aug 19 08:36:36 2006 New Revision: 432839 URL: http://svn.apache.org/viewvc?rev=432839&view=rev Log: More fun with FindBugs. * parser/src/main/java/org/apache/abdera/parser/stax/FOMXPath.java (getXPath): Use Map.entrySet() when we need both the keys and values. * server/src/main/java/org/apache/abdera/server/servlet/AbderaServlet.java (doOutput): Ditto. Modified: incubator/abdera/java/trunk/parser/src/main/java/org/apache/abdera/parser/stax/FOMXPath.java incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/server/servlet/AbderaServlet.java Modified: incubator/abdera/java/trunk/parser/src/main/java/org/apache/abdera/parser/stax/FOMXPath.java URL: http://svn.apache.org/viewvc/incubator/abdera/java/trunk/parser/src/main/java/org/apache/abdera/parser/stax/FOMXPath.java?rev=432839&r1=432838&r2=432839&view=diff ============================================================================== --- incubator/abdera/java/trunk/parser/src/main/java/org/apache/abdera/parser/stax/FOMXPath.java (original) +++ incubator/abdera/java/trunk/parser/src/main/java/org/apache/abdera/parser/stax/FOMXPath.java Sat Aug 19 08:36:36 2006 @@ -41,9 +41,8 @@ DocumentNavigator nav = new DocumentNavigator(); XPath contextpath = new BaseXPath(path, nav); if (namespaces != null) { - for (String key : namespaces.keySet()) { - String value = namespaces.get(key); - contextpath.addNamespace(key, value); + for (Map.Entry entry : namespaces.entrySet()) { + contextpath.addNamespace(entry.getKey(), entry.getValue()); } } Modified: incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/server/servlet/AbderaServlet.java URL: http://svn.apache.org/viewvc/incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/server/servlet/AbderaServlet.java?rev=432839&r1=432838&r2=432839&view=diff ============================================================================== --- incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/server/servlet/AbderaServlet.java (original) +++ incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/server/servlet/AbderaServlet.java Sat Aug 19 08:36:36 2006 @@ -94,12 +94,12 @@ // don't set them. Map> headers = context.getHeaders(); if (headers != null) { - for (String header : headers.keySet()) { - List values = headers.get(header); + for (Map.Entry> entry : headers.entrySet()) { + List values = entry.getValue(); if (values == null) continue; for (String value : values) { - response.setHeader(header, value); + response.setHeader(entry.getKey(), value); } } }