You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by jb...@apache.org on 2015/07/11 15:55:51 UTC
[1/2] karaf git commit: Fix dual definition of felix.resolver
Repository: karaf
Updated Branches:
refs/heads/master 30ff89612 -> 9b181c825
Fix dual definition of felix.resolver
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/18ccadd4
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/18ccadd4
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/18ccadd4
Branch: refs/heads/master
Commit: 18ccadd45687e8a66378543a369db324436ed8aa
Parents: 30ff896
Author: Jean-Baptiste Onofré <jb...@apache.org>
Authored: Sat Jul 11 15:27:17 2015 +0200
Committer: Jean-Baptiste Onofré <jb...@apache.org>
Committed: Sat Jul 11 15:27:17 2015 +0200
----------------------------------------------------------------------
features/core/pom.xml | 5 -----
1 file changed, 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/18ccadd4/features/core/pom.xml
----------------------------------------------------------------------
diff --git a/features/core/pom.xml b/features/core/pom.xml
index 69d62a8..1612d64 100644
--- a/features/core/pom.xml
+++ b/features/core/pom.xml
@@ -75,11 +75,6 @@
<artifactId>org.apache.karaf.util</artifactId>
<scope>provided</scope>
</dependency>
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.resolver</artifactId>
- <scope>provided</scope>
- </dependency>
<dependency>
<groupId>org.eclipse.equinox</groupId>
[2/2] karaf git commit: Fix bundle comparator to prevent NPE
Posted by jb...@apache.org.
Fix bundle comparator to prevent NPE
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/9b181c82
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/9b181c82
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/9b181c82
Branch: refs/heads/master
Commit: 9b181c8250602f65bcd7929711ae327c5aae35fc
Parents: 18ccadd
Author: Jean-Baptiste Onofré <jb...@apache.org>
Authored: Sat Jul 11 15:55:31 2015 +0200
Committer: Jean-Baptiste Onofré <jb...@apache.org>
Committed: Sat Jul 11 15:55:31 2015 +0200
----------------------------------------------------------------------
.../apache/karaf/features/internal/service/BundleComparator.java | 3 +++
1 file changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/9b181c82/features/core/src/main/java/org/apache/karaf/features/internal/service/BundleComparator.java
----------------------------------------------------------------------
diff --git a/features/core/src/main/java/org/apache/karaf/features/internal/service/BundleComparator.java b/features/core/src/main/java/org/apache/karaf/features/internal/service/BundleComparator.java
index 0d1060c..916dfef 100644
--- a/features/core/src/main/java/org/apache/karaf/features/internal/service/BundleComparator.java
+++ b/features/core/src/main/java/org/apache/karaf/features/internal/service/BundleComparator.java
@@ -25,6 +25,9 @@ public class BundleComparator implements Comparator<Bundle> {
@Override
public int compare(Bundle o1, Bundle o2) {
+ if ((o1 == null) || (o2 == null)) {
+ return -1;
+ }
String bsn1 = o1.getSymbolicName();
String bsn2 = o2.getSymbolicName();
int c = bsn1.compareTo(bsn2);