Return-Path: Delivered-To: apmail-incubator-abdera-commits-archive@locus.apache.org Received: (qmail 54957 invoked from network); 9 Feb 2008 01:27:44 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 9 Feb 2008 01:27:44 -0000 Received: (qmail 26729 invoked by uid 500); 9 Feb 2008 01:27:37 -0000 Delivered-To: apmail-incubator-abdera-commits-archive@incubator.apache.org Received: (qmail 26718 invoked by uid 500); 9 Feb 2008 01:27:37 -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 26709 invoked by uid 99); 9 Feb 2008 01:27:37 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 08 Feb 2008 17:27:37 -0800 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; Sat, 09 Feb 2008 01:27:15 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 6BB7A1A9832; Fri, 8 Feb 2008 17:27:23 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r620056 - /incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/ProviderHelper.java Date: Sat, 09 Feb 2008 01:27:23 -0000 To: abdera-commits@incubator.apache.org From: jmsnell@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20080209012723.6BB7A1A9832@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: jmsnell Date: Fri Feb 8 17:27:22 2008 New Revision: 620056 URL: http://svn.apache.org/viewvc?rev=620056&view=rev Log: Per https://issues.apache.org/jira/browse/ABDERA-110 Modified: incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/ProviderHelper.java Modified: incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/ProviderHelper.java URL: http://svn.apache.org/viewvc/incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/ProviderHelper.java?rev=620056&r1=620055&r2=620056&view=diff ============================================================================== --- incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/ProviderHelper.java (original) +++ incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/ProviderHelper.java Fri Feb 8 17:27:22 2008 @@ -561,21 +561,23 @@ Entry entry) { String editUri = null; List editLinks = entry.getLinks("edit"); - for (Link link : editLinks) { - // if there is more than one edit link, we should not automatically - // assume that it's always going to point to an Atom document - // representation. - if (link.getMimeType() != null) { - if (MimeTypeHelper.isMatch( - link.getMimeType().toString(), - Constants.ATOM_MEDIA_TYPE)) { + if (editLinks != null) { + for (Link link : editLinks) { + // if there is more than one edit link, we should not automatically + // assume that it's always going to point to an Atom document + // representation. + if (link.getMimeType() != null) { + if (MimeTypeHelper.isMatch( + link.getMimeType().toString(), + Constants.ATOM_MEDIA_TYPE)) { + editUri = link.getResolvedHref().toString(); + break; + } + } else { + // edit link with no type attribute is the right one to use editUri = link.getResolvedHref().toString(); break; } - } else { - // edit link with no type attribute is the right one to use - editUri = link.getResolvedHref().toString(); - break; } } return editUri;