Return-Path: Delivered-To: apmail-felix-commits-archive@www.apache.org Received: (qmail 43505 invoked from network); 20 Oct 2009 07:51:23 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 20 Oct 2009 07:51:23 -0000 Received: (qmail 96277 invoked by uid 500); 20 Oct 2009 07:51:23 -0000 Delivered-To: apmail-felix-commits-archive@felix.apache.org Received: (qmail 96207 invoked by uid 500); 20 Oct 2009 07:51:23 -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 96198 invoked by uid 99); 20 Oct 2009 07:51:23 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 20 Oct 2009 07:51:23 +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; Tue, 20 Oct 2009 07:51:21 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 9CF0F238889B; Tue, 20 Oct 2009 07:50:59 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r826986 - in /felix/trunk/fileinstall/src/main/java/org/apache/felix/fileinstall/internal: DirectoryWatcher.java Util.java Date: Tue, 20 Oct 2009 07:50:59 -0000 To: commits@felix.apache.org From: gnodet@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20091020075059.9CF0F238889B@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: gnodet Date: Tue Oct 20 07:50:59 2009 New Revision: 826986 URL: http://svn.apache.org/viewvc?rev=826986&view=rev Log: FELIX-1776: the Util.getBundleKey method should just use the bundle id Modified: felix/trunk/fileinstall/src/main/java/org/apache/felix/fileinstall/internal/DirectoryWatcher.java felix/trunk/fileinstall/src/main/java/org/apache/felix/fileinstall/internal/Util.java Modified: felix/trunk/fileinstall/src/main/java/org/apache/felix/fileinstall/internal/DirectoryWatcher.java URL: http://svn.apache.org/viewvc/felix/trunk/fileinstall/src/main/java/org/apache/felix/fileinstall/internal/DirectoryWatcher.java?rev=826986&r1=826985&r2=826986&view=diff ============================================================================== --- felix/trunk/fileinstall/src/main/java/org/apache/felix/fileinstall/internal/DirectoryWatcher.java (original) +++ felix/trunk/fileinstall/src/main/java/org/apache/felix/fileinstall/internal/DirectoryWatcher.java Tue Oct 20 07:50:59 2009 @@ -259,12 +259,15 @@ boolean exists = file.exists(); Artifact artifact = (Artifact) currentManagedArtifacts.get(file); // File has been deleted - if (!exists && artifact != null) + if (!exists) { - deleteJaredDirectory(artifact); - deleteTransformedFile(artifact); - deleted.add(artifact); + if (artifact != null) { + deleteJaredDirectory(artifact); + deleteTransformedFile(artifact); + deleted.add(artifact); + } } + // File exists else { File jar = file; @@ -295,7 +298,7 @@ } } // File has been modified - if (exists && artifact != null) + if (artifact != null) { artifact.setChecksum(scanner.getChecksum(file)); // If there's no listener, this is because this artifact has been installed before @@ -338,7 +341,7 @@ } } // File has been added - if (exists && artifact == null) + else { // Find the listener ArtifactListener listener = findListener(jar, listeners); Modified: felix/trunk/fileinstall/src/main/java/org/apache/felix/fileinstall/internal/Util.java URL: http://svn.apache.org/viewvc/felix/trunk/fileinstall/src/main/java/org/apache/felix/fileinstall/internal/Util.java?rev=826986&r1=826985&r2=826986&view=diff ============================================================================== --- felix/trunk/fileinstall/src/main/java/org/apache/felix/fileinstall/internal/Util.java (original) +++ felix/trunk/fileinstall/src/main/java/org/apache/felix/fileinstall/internal/Util.java Tue Oct 20 07:50:59 2009 @@ -39,9 +39,7 @@ import org.osgi.framework.Bundle; import org.osgi.framework.BundleContext; -import org.osgi.framework.Constants; import org.osgi.framework.ServiceReference; -import org.osgi.framework.Version; import org.osgi.service.log.LogService; public class Util @@ -451,11 +449,7 @@ private static String getBundleKey(Bundle b) { - StringBuffer sb = new StringBuffer(); - sb.append(b.getSymbolicName()).append("_"); - String version = (String) b.getHeaders().get(Constants.BUNDLE_VERSION); - sb.append(version != null ? version : Version.emptyVersion.toString()); - return sb.toString(); + return Long.toString(b.getBundleId()); } }