commit ef1af6cca6377c97c1b6159d3ad11ee6257babf7
author Stuart McCulloch <mcculls@apache.org> Thu Jan 29 08:20:51 2009 +0000
committer Stuart McCulloch <mcculls@apache.org> Thu Jan 29 08:20:51 2009 +0000
tree 9b5a53e23628a2d3a07a76689ada9cbef4db5e02
parent 279be901ed24343c3446d42042c8e48a0b739616

Re-apply FELIX-843 patch to latest BND code

git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@738794 13f79535-47bb-0310-9956-ffa450edef68

bundleplugin/src/main/java/aQute/lib/osgi/Builder.java

diff --git a/bundleplugin/src/main/java/aQute/lib/osgi/Builder.java b/bundleplugin/src/main/java/aQute/lib/osgi/Builder.java
index 393e7ee..7c631ae 100644
--- a/bundleplugin/src/main/java/aQute/lib/osgi/Builder.java
+++ b/bundleplugin/src/main/java/aQute/lib/osgi/Builder.java
@@ -266,7 +266,7 @@
             // Private-Package
             Map<String, Map<String, String>> filtered = merge(
                     CONDITIONAL_PACKAGE, conditionals, imports,
-                    new HashSet<String>());
+                    new HashSet<String>(), null);
 
             // Imports can also specify a private import. These
             // packages must also be copied to the bundle