Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Watson2009-07-08 18:17:59 +0000
committerThomas Watson2009-07-08 18:17:59 +0000
commita341a3f30ad2d12525bfe8ce55605d117b110d49 (patch)
tree71f9cbbe5ba06458335d250b35531a76249b7ffa
parent6e2816461b9dfa5d8ba84b3f22cab346543b54ad (diff)
downloadrt.equinox.framework-a341a3f30ad2d12525bfe8ce55605d117b110d49.tar.gz
rt.equinox.framework-a341a3f30ad2d12525bfe8ce55605d117b110d49.tar.xz
rt.equinox.framework-a341a3f30ad2d12525bfe8ce55605d117b110d49.zip
Bug 282747 The library.extensions configuration property does not require leading '.' dots
-rw-r--r--bundles/org.eclipse.osgi/defaultAdaptor/src/org/eclipse/osgi/internal/baseadaptor/BaseClassLoadingHook.java11
1 files changed, 9 insertions, 2 deletions
diff --git a/bundles/org.eclipse.osgi/defaultAdaptor/src/org/eclipse/osgi/internal/baseadaptor/BaseClassLoadingHook.java b/bundles/org.eclipse.osgi/defaultAdaptor/src/org/eclipse/osgi/internal/baseadaptor/BaseClassLoadingHook.java
index cea3bc8e5..f1f8abf62 100644
--- a/bundles/org.eclipse.osgi/defaultAdaptor/src/org/eclipse/osgi/internal/baseadaptor/BaseClassLoadingHook.java
+++ b/bundles/org.eclipse.osgi/defaultAdaptor/src/org/eclipse/osgi/internal/baseadaptor/BaseClassLoadingHook.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2005, 2008 IBM Corporation and others.
+ * Copyright (c) 2005, 2009 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -26,8 +26,15 @@ import org.eclipse.osgi.util.ManifestElement;
import org.osgi.framework.Constants;
public class BaseClassLoadingHook implements ClassLoadingHook {
- private static final String[] LIB_EXTENSIONS = ManifestElement.getArrayFromList(FrameworkProperties.getProperty("osgi.framework.library.extensions", FrameworkProperties.getProperty(Constants.FRAMEWORK_LIBRARY_EXTENSIONS)), ","); //$NON-NLS-1$ //$NON-NLS-2$
+ private static final String[] LIB_EXTENSIONS;
private static final String[] EMPTY_STRINGS = new String[0];
+ static {
+ String[] libExtensions = ManifestElement.getArrayFromList(FrameworkProperties.getProperty("osgi.framework.library.extensions", FrameworkProperties.getProperty(Constants.FRAMEWORK_LIBRARY_EXTENSIONS)), ","); //$NON-NLS-1$ //$NON-NLS-2$
+ for (int i = 0; i < libExtensions.length; i++)
+ if (libExtensions[i].length() > 0 && libExtensions[i].charAt(0) != '.')
+ libExtensions[i] = '.' + libExtensions[i];
+ LIB_EXTENSIONS = libExtensions;
+ }
/*
* Maps an already mapped library name to additional library file extensions.

Back to the top