[jboss-osgi-commits] JBoss-OSGI SVN: r92806 - projects/jboss-osgi/projects/runtime/microcontainer/trunk/src/main/java/org/jboss/osgi/plugins/facade/classloading.

[jboss-osgi-commits at lists.jboss.org]

Author: thomas.diesler at jboss.com
Date: 2009-08-25 14:57:35 -0400 (Tue, 25 Aug 2009)
New Revision: 92806

Modified:
   projects/jboss-osgi/projects/runtime/microcontainer/trunk/src/main/java/org/jboss/osgi/plugins/facade/classloading/OSGiPackageCapability.java
Log:
Fix export package version parsing

Modified: projects/jboss-osgi/projects/runtime/microcontainer/trunk/src/main/java/org/jboss/osgi/plugins/facade/classloading/OSGiPackageCapability.java
===================================================================
--- projects/jboss-osgi/projects/runtime/microcontainer/trunk/src/main/java/org/jboss/osgi/plugins/facade/classloading/OSGiPackageCapability.java	2009-08-25 18:33:36 UTC (rev 92805)
+++ projects/jboss-osgi/projects/runtime/microcontainer/trunk/src/main/java/org/jboss/osgi/plugins/facade/classloading/OSGiPackageCapability.java	2009-08-25 18:57:35 UTC (rev 92806)
@@ -67,6 +67,7 @@
     * @return the capability
     * @throws IllegalArgumentException for null metadata
     */
+   @SuppressWarnings("deprecation")
    public static OSGiPackageCapability create(OSGiMetaData metadata, PackageAttribute exportPackage)
    {
       if (metadata == null)
@@ -84,12 +85,16 @@
             versionString = oldVersionString;
       }
       
-      // [TODO] Handle version strings with quotes 
-      //if (versionString.startsWith("\"") && versionString.endsWith("\""))
-      //   versionString = versionString.substring(1, versionString.length() - 1);
+      Version version = null;
+      if (versionString != null)
+      {
+         // Handle version strings with quotes 
+         if (versionString.startsWith("\"") && versionString.endsWith("\""))
+            versionString = versionString.substring(1, versionString.length() - 1);
+         
+         Version.parseVersion(versionString);
+      }
       
-      Version version = Version.parseVersion(versionString);
-      
       return new OSGiPackageCapability(name, version, metadata, exportPackage);
    }
    
@@ -136,6 +141,7 @@
       return metadata;
    }
 
+   @SuppressWarnings("deprecation")
    @Override
    public boolean resolves(Module module, Requirement requirement)
    {