Return-Path: X-Original-To: apmail-felix-commits-archive@www.apache.org Delivered-To: apmail-felix-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 90B52D549 for ; Wed, 25 Jul 2012 19:44:36 +0000 (UTC) Received: (qmail 56728 invoked by uid 500); 25 Jul 2012 19:44:36 -0000 Delivered-To: apmail-felix-commits-archive@felix.apache.org Received: (qmail 56699 invoked by uid 500); 25 Jul 2012 19:44:36 -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 56691 invoked by uid 99); 25 Jul 2012 19:44:36 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 25 Jul 2012 19:44:36 +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, 25 Jul 2012 19:44:34 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 160902388906 for ; Wed, 25 Jul 2012 19:43:50 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1365704 - /felix/trunk/framework/src/main/java/org/apache/felix/framework/BundleRevisionImpl.java Date: Wed, 25 Jul 2012 19:43:50 -0000 To: commits@felix.apache.org From: rickhall@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120725194350.160902388906@eris.apache.org> Author: rickhall Date: Wed Jul 25 19:43:49 2012 New Revision: 1365704 URL: http://svn.apache.org/viewvc?rev=1365704&view=rev Log: Properly check for R4 bundles when determining bundle type. (FELIX-3343) Modified: felix/trunk/framework/src/main/java/org/apache/felix/framework/BundleRevisionImpl.java Modified: felix/trunk/framework/src/main/java/org/apache/felix/framework/BundleRevisionImpl.java URL: http://svn.apache.org/viewvc/felix/trunk/framework/src/main/java/org/apache/felix/framework/BundleRevisionImpl.java?rev=1365704&r1=1365703&r2=1365704&view=diff ============================================================================== --- felix/trunk/framework/src/main/java/org/apache/felix/framework/BundleRevisionImpl.java (original) +++ felix/trunk/framework/src/main/java/org/apache/felix/framework/BundleRevisionImpl.java Wed Jul 25 19:43:49 2012 @@ -93,7 +93,7 @@ public class BundleRevisionImpl implemen m_id = id; m_headerMap = null; m_content = null; - m_manifestVersion = null; + m_manifestVersion = ""; m_symbolicName = null; m_isExtension = false; m_isFragment = false; @@ -250,7 +250,7 @@ public class BundleRevisionImpl implemen public int getTypes() { - return (m_isFragment) ? BundleRevision.TYPE_FRAGMENT : 0; + return (getManifestVersion().equals("2") && m_isFragment) ? BundleRevision.TYPE_FRAGMENT : 0; } public BundleWiring getWiring()