Return-Path: Delivered-To: apmail-felix-commits-archive@www.apache.org Received: (qmail 70921 invoked from network); 19 Jul 2009 11:36:55 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 19 Jul 2009 11:36:55 -0000 Received: (qmail 55715 invoked by uid 500); 19 Jul 2009 11:38:00 -0000 Delivered-To: apmail-felix-commits-archive@felix.apache.org Received: (qmail 55649 invoked by uid 500); 19 Jul 2009 11:38:00 -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 55640 invoked by uid 99); 19 Jul 2009 11:38:00 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 19 Jul 2009 11:38:00 +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, 19 Jul 2009 11:37:58 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id D30AA238886D; Sun, 19 Jul 2009 11:37:37 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r795520 - /felix/trunk/fileinstall/src/main/java/org/apache/felix/fileinstall/Jar.java Date: Sun, 19 Jul 2009 11:37:37 -0000 To: commits@felix.apache.org From: filippo@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090719113737.D30AA238886D@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: filippo Date: Sun Jul 19 11:37:37 2009 New Revision: 795520 URL: http://svn.apache.org/viewvc?rev=795520&view=rev Log: FELIX-1382. FileInstall attempts to uninstall SystemBundle. Patch provided by Sahoo Modified: felix/trunk/fileinstall/src/main/java/org/apache/felix/fileinstall/Jar.java Modified: felix/trunk/fileinstall/src/main/java/org/apache/felix/fileinstall/Jar.java URL: http://svn.apache.org/viewvc/felix/trunk/fileinstall/src/main/java/org/apache/felix/fileinstall/Jar.java?rev=795520&r1=795519&r2=795520&view=diff ============================================================================== --- felix/trunk/fileinstall/src/main/java/org/apache/felix/fileinstall/Jar.java (original) +++ felix/trunk/fileinstall/src/main/java/org/apache/felix/fileinstall/Jar.java Sun Jul 19 11:37:37 2009 @@ -23,6 +23,7 @@ import java.net.URISyntaxException; import org.osgi.framework.Bundle; +import org.osgi.framework.Constants; /** * This class is used to cache vital information of a jar file @@ -59,7 +60,8 @@ // Normalisation is needed to ensure that we don't treat (e.g.) // /tmp/foo and /tmp//foo differently. String location = b.getLocation(); - if (location != null) + if (location != null && + !location.equals(Constants.SYSTEM_BUNDLE_LOCATION)) { URI uri; try