Return-Path: 
 <commits-return-15173-apmail-felix-commits-archive=felix.apache.org@felix.apache.org>
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 0F44F4403
	for <apmail-felix-commits-archive@www.apache.org>;
 Mon, 27 Jun 2011 20:44:25 +0000 (UTC)
Received: (qmail 38790 invoked by uid 500); 27 Jun 2011 20:44:24 -0000
Delivered-To: apmail-felix-commits-archive@felix.apache.org
Received: (qmail 38697 invoked by uid 500); 27 Jun 2011 20:44:24 -0000
Mailing-List: contact commits-help@felix.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@felix.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@felix.apache.org>
List-Post: <mailto:commits@felix.apache.org>
List-Id: <commits.felix.apache.org>
Reply-To: dev@felix.apache.org
Delivered-To: mailing list commits@felix.apache.org
Received: (qmail 38690 invoked by uid 99); 27 Jun 2011 20:44:24 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 27 Jun 2011 20:44:24 +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; Mon, 27 Jun 2011 20:44:22 +0000
Received: from eris.apache.org (localhost [127.0.0.1])
	by eris.apache.org (Postfix) with ESMTP id 1E6A523889BF
	for <commits@felix.apache.org>; Mon, 27 Jun 2011 20:44:01 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1140307 -
 /felix/trunk/framework/src/main/java/org/apache/felix/framework/BundleImpl.java
Date: Mon, 27 Jun 2011 20:44:01 -0000
To: commits@felix.apache.org
From: rickhall@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20110627204401.1E6A523889BF@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: rickhall
Date: Mon Jun 27 20:44:00 2011
New Revision: 1140307

URL: http://svn.apache.org/viewvc?rev=1140307&view=rev
Log:
Need to check if a revision has a wiring or not. (FELIX-3013)

Modified:
    felix/trunk/framework/src/main/java/org/apache/felix/framework/BundleImpl.java

Modified: felix/trunk/framework/src/main/java/org/apache/felix/framework/BundleImpl.java
URL: http://svn.apache.org/viewvc/felix/trunk/framework/src/main/java/org/apache/felix/framework/BundleImpl.java?rev=1140307&r1=1140306&r2=1140307&view=diff
==============================================================================
--- felix/trunk/framework/src/main/java/org/apache/felix/framework/BundleImpl.java (original)
+++ felix/trunk/framework/src/main/java/org/apache/felix/framework/BundleImpl.java Mon Jun 27 20:44:00 2011
@@ -506,10 +506,16 @@ class BundleImpl implements Bundle
         // Create a list of the revision and any attached fragment revisions.
         List<BundleRevision> result = new ArrayList<BundleRevision>();
         result.add(br);
-        List<BundleRevision> fragments = ((BundleWiringImpl) br.getWiring()).getFragments();
-        if (fragments != null)
+        BundleWiring wiring = br.getWiring();
+        if (wiring != null)
         {
-            result.addAll(fragments);
+// TODO: OSGi R4.3 - Technically, I think we can get the fragments using standard
+//       R4.3 API once we get everything implemented.
+            List<BundleRevision> fragments = ((BundleWiringImpl) wiring).getFragments();
+            if (fragments != null)
+            {
+                result.addAll(fragments);
+            }
         }
         return result;
     }