| commit | e55bdbcedee9ac4683e9d9ef9a08984135b18443 | [log] [tgz] |
|---|---|---|
| author | Stuart McCulloch <mcculls@apache.org> | Sat Feb 02 14:49:03 2008 +0000 |
| committer | Stuart McCulloch <mcculls@apache.org> | Sat Feb 02 14:49:03 2008 +0000 |
| tree | 15b123613190baa67f4136c13363fd3d7d266c8b | |
| parent | 6aefce8e3bcab1a7de30f723ae6c529012338e5b [diff] |
Add check to avoid overwriting custom settings in certain situations git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@617808 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/bundleplugin/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java b/bundleplugin/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java index 6182fe7..4b7382d 100644 --- a/bundleplugin/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java +++ b/bundleplugin/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java
@@ -338,7 +338,7 @@ builder.setProperties( properties ); builder.setClasspath( classpath ); - if ( !properties.containsKey( Analyzer.PRIVATE_PACKAGE ) ) + if ( !properties.containsKey( Analyzer.EXPORT_PACKAGE ) && !properties.containsKey( Analyzer.PRIVATE_PACKAGE ) ) { String bsn = properties.getProperty( Analyzer.BUNDLE_SYMBOLICNAME ); String namespace = bsn.replaceAll( "\\W", "." );