You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by pa...@apache.org on 2009/10/04 20:50:31 UTC
svn commit: r821574 - in
/felix/trunk/framework/src/main/java/org/apache/felix/framework:
URLHandlersBundleURLConnection.java util/manifestparser/R4LibraryClause.java
Author: pauls
Date: Sun Oct 4 18:50:31 2009
New Revision: 821574
URL: http://svn.apache.org/viewvc?rev=821574&view=rev
Log:
Fix a typo in framework discovery in URLHandlersBundleURLConnection (FELIX-1698)
Modified:
felix/trunk/framework/src/main/java/org/apache/felix/framework/URLHandlersBundleURLConnection.java
felix/trunk/framework/src/main/java/org/apache/felix/framework/util/manifestparser/R4LibraryClause.java
Modified: felix/trunk/framework/src/main/java/org/apache/felix/framework/URLHandlersBundleURLConnection.java
URL: http://svn.apache.org/viewvc/felix/trunk/framework/src/main/java/org/apache/felix/framework/URLHandlersBundleURLConnection.java?rev=821574&r1=821573&r2=821574&view=diff
==============================================================================
--- felix/trunk/framework/src/main/java/org/apache/felix/framework/URLHandlersBundleURLConnection.java (original)
+++ felix/trunk/framework/src/main/java/org/apache/felix/framework/URLHandlersBundleURLConnection.java Sun Oct 4 18:50:31 2009
@@ -55,7 +55,7 @@
Object tmp = URLHandlers.getFrameworkFromContext();
if (tmp instanceof Felix)
{
- m_framework = (Felix) framework;
+ m_framework = (Felix) tmp;
}
}
Modified: felix/trunk/framework/src/main/java/org/apache/felix/framework/util/manifestparser/R4LibraryClause.java
URL: http://svn.apache.org/viewvc/felix/trunk/framework/src/main/java/org/apache/felix/framework/util/manifestparser/R4LibraryClause.java?rev=821574&r1=821573&r2=821574&view=diff
==============================================================================
--- felix/trunk/framework/src/main/java/org/apache/felix/framework/util/manifestparser/R4LibraryClause.java (original)
+++ felix/trunk/framework/src/main/java/org/apache/felix/framework/util/manifestparser/R4LibraryClause.java Sun Oct 4 18:50:31 2009
@@ -449,7 +449,8 @@
{
value = value.toLowerCase();
- if (value.startsWith("x86-64") || value.startsWith("amd64"))
+ if (value.startsWith("x86-64") || value.startsWith("amd64") ||
+ value.startsWith("em64") || value.startsWith("x86_64"))
{
return "x86-64";
}