attempted fix for issue #57

eclipse-archived · Oct 19, 2018 · da96bfd · da96bfd
1 parent e88b966
commit da96bfd
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/framework/org.eclipse.concierge/src/org/eclipse/concierge/BundleImpl.java b/framework/org.eclipse.concierge/src/org/eclipse/concierge/BundleImpl.java
@@ -2770,7 +2770,7 @@ && checkActivation(pkg)) {
 
 						// TODO: first check if dynImport could apply to the
 						// requested package!!!
-						if (RFC1960Filter.stringCompare(
+						if (pkg.length() > 0 && RFC1960Filter.stringCompare(
 								dynImportPackage.toCharArray(), 0,
 								pkg.toCharArray(), 0) != 0) {
 							continue;

diff --git a/framework/org.eclipse.concierge/src/org/eclipse/concierge/Concierge.java b/framework/org.eclipse.concierge/src/org/eclipse/concierge/Concierge.java
@@ -146,7 +146,7 @@ public final class Concierge extends AbstractBundle implements Framework,
 	/**
 	 * Version displayed upon startup and returned by System Bundle
 	 */
-	private static final String FRAMEWORK_VERSION = "5.1.0.SNAPSHOT-20171014090828";
+	private static final String FRAMEWORK_VERSION = "5.1.0.SNAPSHOT";
 
 	@SuppressWarnings("deprecation")
 	private static Class<?> SERVICE_EVENT_HOOK_CLASS = org.osgi.framework.hooks.service.EventHook.class;