commit 38b2b038eb86cad1e0f881d8fda6f211015d177c
author Richard S. Hall <rickhall@apache.org> Mon Feb 05 20:39:08 2007 +0000
committer Richard S. Hall <rickhall@apache.org> Mon Feb 05 20:39:08 2007 +0000
tree 993148e2676177bbffc1c227fe2634ef63076b61
parent 2bddf8cacd27d1b36ff63d3fa3bf7e057d2eb90e

Fixed a bug that was not properly normalizing the processor type because 
it wasn't checking for the more specific x86-64 before x86.


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

framework/src/main/java/org/apache/felix/framework/util/manifestparser/R4LibraryClause.java

diff --git a/framework/src/main/java/org/apache/felix/framework/util/manifestparser/R4LibraryClause.java b/framework/src/main/java/org/apache/felix/framework/util/manifestparser/R4LibraryClause.java
index e9f31ca..9d2a16f 100644
--- a/framework/src/main/java/org/apache/felix/framework/util/manifestparser/R4LibraryClause.java
+++ b/framework/src/main/java/org/apache/felix/framework/util/manifestparser/R4LibraryClause.java
@@ -435,16 +435,16 @@
     {
         value = value.toLowerCase();
 
-        if (value.startsWith("x86") || value.startsWith("pentium")
+        if (value.startsWith("x86-64") || value.startsWith("amd64"))
+        {
+            return "x86-64";
+        }
+        else if (value.startsWith("x86") || value.startsWith("pentium")
             || value.startsWith("i386") || value.startsWith("i486")
             || value.startsWith("i586") || value.startsWith("i686"))
         {
             return "x86";
         }
-        else if (value.startsWith("x86-64") || value.startsWith("amd64"))
-        {
-            return "x86-64";
-        }
         else if (value.startsWith("68k"))
         {
             return "68k";