| commit | f80834775b7f1ecc3750a7f3f1a5744be0c2fd0f | [log] [tgz] |
|---|---|---|
| author | Karl Pauls <pauls@apache.org> | Sun Oct 04 18:50:31 2009 +0000 |
| committer | Karl Pauls <pauls@apache.org> | Sun Oct 04 18:50:31 2009 +0000 |
| tree | e3b4a367528d6705bc6aeaf10125552c8e37f975 | |
| parent | b5574afe3756c212744f20586a433f5db4894d0d [diff] |
Fix a typo in framework discovery in URLHandlersBundleURLConnection (FELIX-1698) git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@821574 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/framework/src/main/java/org/apache/felix/framework/URLHandlersBundleURLConnection.java b/framework/src/main/java/org/apache/felix/framework/URLHandlersBundleURLConnection.java index d6fa817..3947785 100644 --- a/framework/src/main/java/org/apache/felix/framework/URLHandlersBundleURLConnection.java +++ b/framework/src/main/java/org/apache/felix/framework/URLHandlersBundleURLConnection.java
@@ -55,7 +55,7 @@ Object tmp = URLHandlers.getFrameworkFromContext(); if (tmp instanceof Felix) { - m_framework = (Felix) framework; + m_framework = (Felix) tmp; } }
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 cbd7d73..1457979 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
@@ -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"; }