Return-Path: Delivered-To: apmail-felix-commits-archive@www.apache.org Received: (qmail 45826 invoked from network); 4 Oct 2009 18:51:26 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 4 Oct 2009 18:51:26 -0000 Received: (qmail 26646 invoked by uid 500); 4 Oct 2009 18:51:26 -0000 Delivered-To: apmail-felix-commits-archive@felix.apache.org Received: (qmail 26587 invoked by uid 500); 4 Oct 2009 18:51:26 -0000 Mailing-List: contact commits-help@felix.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@felix.apache.org Delivered-To: mailing list commits@felix.apache.org Received: (qmail 26578 invoked by uid 99); 4 Oct 2009 18:51:26 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 04 Oct 2009 18:51:26 +0000 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.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 04 Oct 2009 18:51:23 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 933B623888C2; Sun, 4 Oct 2009 18:50:31 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r821574 - in /felix/trunk/framework/src/main/java/org/apache/felix/framework: URLHandlersBundleURLConnection.java util/manifestparser/R4LibraryClause.java Date: Sun, 04 Oct 2009 18:50:31 -0000 To: commits@felix.apache.org From: pauls@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20091004185031.933B623888C2@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: pauls Date: Sun Oct 4 18:50:31 2009 New Revision: 821574 URL: http://svn.apache.org/viewvc?rev=821574&view=rev Log: Fix a typo in framework discovery in URLHandlersBundleURLConnection (FELIX-1698) Modified: felix/trunk/framework/src/main/java/org/apache/felix/framework/URLHandlersBundleURLConnection.java felix/trunk/framework/src/main/java/org/apache/felix/framework/util/manifestparser/R4LibraryClause.java Modified: felix/trunk/framework/src/main/java/org/apache/felix/framework/URLHandlersBundleURLConnection.java URL: http://svn.apache.org/viewvc/felix/trunk/framework/src/main/java/org/apache/felix/framework/URLHandlersBundleURLConnection.java?rev=821574&r1=821573&r2=821574&view=diff ============================================================================== --- felix/trunk/framework/src/main/java/org/apache/felix/framework/URLHandlersBundleURLConnection.java (original) +++ felix/trunk/framework/src/main/java/org/apache/felix/framework/URLHandlersBundleURLConnection.java Sun Oct 4 18:50:31 2009 @@ -55,7 +55,7 @@ Object tmp = URLHandlers.getFrameworkFromContext(); if (tmp instanceof Felix) { - m_framework = (Felix) framework; + m_framework = (Felix) tmp; } } Modified: felix/trunk/framework/src/main/java/org/apache/felix/framework/util/manifestparser/R4LibraryClause.java URL: http://svn.apache.org/viewvc/felix/trunk/framework/src/main/java/org/apache/felix/framework/util/manifestparser/R4LibraryClause.java?rev=821574&r1=821573&r2=821574&view=diff ============================================================================== --- felix/trunk/framework/src/main/java/org/apache/felix/framework/util/manifestparser/R4LibraryClause.java (original) +++ felix/trunk/framework/src/main/java/org/apache/felix/framework/util/manifestparser/R4LibraryClause.java Sun Oct 4 18:50:31 2009 @@ -449,7 +449,8 @@ { value = value.toLowerCase(); - if (value.startsWith("x86-64") || value.startsWith("amd64")) + if (value.startsWith("x86-64") || value.startsWith("amd64") || + value.startsWith("em64") || value.startsWith("x86_64")) { return "x86-64"; }