You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by ri...@apache.org on 2007/02/05 21:39:09 UTC
svn commit: r503861 -
/incubator/felix/trunk/framework/src/main/java/org/apache/felix/framework/util/manifestparser/R4LibraryClause.java
Author: rickhall
Date: Mon Feb 5 12:39:08 2007
New Revision: 503861
URL: http://svn.apache.org/viewvc?view=rev&rev=503861
Log:
Fixed a bug that was not properly normalizing the processor type because
it wasn't checking for the more specific x86-64 before x86.
Modified:
incubator/felix/trunk/framework/src/main/java/org/apache/felix/framework/util/manifestparser/R4LibraryClause.java
Modified: incubator/felix/trunk/framework/src/main/java/org/apache/felix/framework/util/manifestparser/R4LibraryClause.java
URL: http://svn.apache.org/viewvc/incubator/felix/trunk/framework/src/main/java/org/apache/felix/framework/util/manifestparser/R4LibraryClause.java?view=diff&rev=503861&r1=503860&r2=503861
==============================================================================
--- incubator/felix/trunk/framework/src/main/java/org/apache/felix/framework/util/manifestparser/R4LibraryClause.java (original)
+++ incubator/felix/trunk/framework/src/main/java/org/apache/felix/framework/util/manifestparser/R4LibraryClause.java Mon Feb 5 12:39:08 2007
@@ -435,15 +435,15 @@
{
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"))
{