commit a1fa2fb70a49c3ba7d28ef976d1ce561f1f9a61f
author Bob Paulin <bob@apache.org> Sat Dec 06 05:08:44 2014 +0000
committer Bob Paulin <bob@apache.org> Sat Dec 06 05:08:44 2014 +0000
tree f3d37eb62e766a9b252c464d3915fc5005fd74e5
parent dec2c509e9cd0ddc4cbc22fbc41aaebea121caf0

FELIX-4721 Parse OS Version prior to creating Version object

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

framework/src/main/java/org/apache/felix/framework/ExtensionManager.java

diff --git a/framework/src/main/java/org/apache/felix/framework/ExtensionManager.java b/framework/src/main/java/org/apache/felix/framework/ExtensionManager.java
index a76a769..9ce710b 100644
--- a/framework/src/main/java/org/apache/felix/framework/ExtensionManager.java
+++ b/framework/src/main/java/org/apache/felix/framework/ExtensionManager.java
@@ -35,6 +35,8 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 import java.util.NoSuchElementException;
 import java.util.Set;
 
@@ -245,35 +247,41 @@
         }
     }
 
-	protected BundleCapability buildNativeCapabilites() {
-		String osArchitecture = (String)m_configMap.get(FelixConstants.FRAMEWORK_PROCESSOR);
-		String osName = (String)m_configMap.get(FelixConstants.FRAMEWORK_OS_NAME);
-		String osVersion = (String)m_configMap.get(FelixConstants.FRAMEWORK_OS_VERSION);
-		String userLang = (String)m_configMap.get(FelixConstants.FRAMEWORK_LANGUAGE);
-		Map<String, Object> attributes = new HashMap<String, Object>();
+    protected BundleCapability buildNativeCapabilites() {
+        String osArchitecture = (String)m_configMap.get(FelixConstants.FRAMEWORK_PROCESSOR);
+        String osName = (String)m_configMap.get(FelixConstants.FRAMEWORK_OS_NAME);
+        String osVersion = (String)m_configMap.get(FelixConstants.FRAMEWORK_OS_VERSION);
+        String userLang = (String)m_configMap.get(FelixConstants.FRAMEWORK_LANGUAGE);
+        Map<String, Object> attributes = new HashMap<String, Object>();
 
-		if( osArchitecture != null )
-		{
-			attributes.put(NativeNamespace.CAPABILITY_PROCESSOR_ATTRIBUTE, osArchitecture);
-		}
+        if( osArchitecture != null )
+        {
+            attributes.put(NativeNamespace.CAPABILITY_PROCESSOR_ATTRIBUTE, osArchitecture);
+        }
 
-		if( osName != null)
-		{
-			attributes.put(NativeNamespace.CAPABILITY_OSNAME_ATTRIBUTE, osName);
-		}
+        if( osName != null)
+        {
+            attributes.put(NativeNamespace.CAPABILITY_OSNAME_ATTRIBUTE, osName);
+        }
 
-		if( osVersion != null)
-		{
-			attributes.put(NativeNamespace.CAPABILITY_OSVERSION_ATTRIBUTE, new Version(osVersion));
-		}
+        if( osVersion != null)
+        {
+            Pattern versionPattern = Pattern.compile("\\d+\\.?\\d*\\.?\\d*");
+            Matcher matcher = versionPattern.matcher(osVersion);
+            if(matcher.find())
+            {
+                osVersion = matcher.group();
+            }
+            attributes.put(NativeNamespace.CAPABILITY_OSVERSION_ATTRIBUTE, new Version(osVersion));
+        }
 
-		if( userLang != null)
-		{
-			attributes.put(NativeNamespace.CAPABILITY_LANGUAGE_ATTRIBUTE, userLang);
-		}
+        if( userLang != null)
+        {
+            attributes.put(NativeNamespace.CAPABILITY_LANGUAGE_ATTRIBUTE, userLang);
+        }
 
-		return new BundleCapabilityImpl(getRevision(), NativeNamespace.NATIVE_NAMESPACE, Collections.<String, String> emptyMap(), attributes);
-	}
+        return new BundleCapabilityImpl(getRevision(), NativeNamespace.NATIVE_NAMESPACE, Collections.<String, String> emptyMap(), attributes);
+    }
 
     private static List<BundleCapability> aliasSymbolicName(List<BundleCapability> caps)
     {