Author: gnodet
Date: Mon May 21 22:44:38 2012
New Revision: 1341241
URL: http://svn.apache.org/viewvc?rev=1341241&view=rev
Log:
ARIES-777 Introduce a R43Worker to get classloader from bundle in r 4.3
frameworks. Also avoid an NPE I ran into
Conflicts:
util/pom.xml
util/src/main/java/org/apache/aries/util/internal/DefaultWorker.java
Added:
aries/branches/blueprint-0.3.2-fixes/util/src/main/java/org/apache/aries/util/internal/R43Worker.java
Modified:
aries/branches/blueprint-0.3.2-fixes/util/pom.xml
aries/branches/blueprint-0.3.2-fixes/util/src/main/java/org/apache/aries/util/AriesFrameworkUtil.java
aries/branches/blueprint-0.3.2-fixes/util/src/main/java/org/apache/aries/util/internal/DefaultWorker.java
aries/branches/blueprint-0.3.2-fixes/util/src/main/java/org/apache/aries/util/nls/MessageUtil.java
Modified: aries/branches/blueprint-0.3.2-fixes/util/pom.xml
URL:
http://svn.apache.org/viewvc/aries/branches/blueprint-0.3.2-fixes/util/pom.xml?rev=1341241&r1=1341240&r2=1341241&view=diff
==============================================================================
--- aries/branches/blueprint-0.3.2-fixes/util/pom.xml (original)
+++ aries/branches/blueprint-0.3.2-fixes/util/pom.xml Mon May 21 22:44:38 2012
@@ -48,6 +48,7 @@
<aries.osgi.import.pkg>
!org.apache.aries.util*,
org.osgi.framework.launch;resolution:=optional,
+ org.osgi.framework.wiring.*;resolution:=optional,
org.osgi.service.framework;resolution:=optional,
org.eclipse.osgi.internal.loader;resolution:=optional,
org.eclipse.osgi.framework.internal.core;resolution:=optional,
@@ -63,6 +64,7 @@
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
+ <version>4.3.0</version>
<scope>provided</scope>
</dependency>
<dependency>
Modified:
aries/branches/blueprint-0.3.2-fixes/util/src/main/java/org/apache/aries/util/AriesFrameworkUtil.java
URL:
http://svn.apache.org/viewvc/aries/branches/blueprint-0.3.2-fixes/util/src/main/java/org/apache/aries/util/AriesFrameworkUtil.java?rev=1341241&r1=1341240&r2=1341241&view=diff
==============================================================================
---
aries/branches/blueprint-0.3.2-fixes/util/src/main/java/org/apache/aries/util/AriesFrameworkUtil.java
(original)
+++
aries/branches/blueprint-0.3.2-fixes/util/src/main/java/org/apache/aries/util/AriesFrameworkUtil.java
Mon May 21 22:44:38 2012
@@ -22,19 +22,24 @@ import org.apache.aries.util.internal.De
import org.apache.aries.util.internal.EquinoxWorker;
import org.apache.aries.util.internal.FelixWorker;
import org.apache.aries.util.internal.FrameworkUtilWorker;
+import org.apache.aries.util.internal.R43Worker;
import org.osgi.framework.Bundle;
import org.osgi.framework.FrameworkUtil;
-public final class AriesFrameworkUtil
+public final class AriesFrameworkUtil
{
private static FrameworkUtilWorker worker;
static {
+ try {
+ worker = new R43Worker();
+ } catch (Throwable e) {
+ }
Bundle b = FrameworkUtil.getBundle(AriesFrameworkUtil.class);
- String bundleClassName = b.getClass().getName();
- if (isEquinox(bundleClassName)) {
+ String bundleClassName = b == null? "": b.getClass().getName();
+ if (worker == null && isEquinox(bundleClassName)) {
worker = new EquinoxWorker();
- } else if (bundleClassName.startsWith("org.apache.felix")) {
+ } else if (worker == null &&
bundleClassName.startsWith("org.apache.felix")) {
worker = new FelixWorker();
}
Modified:
aries/branches/blueprint-0.3.2-fixes/util/src/main/java/org/apache/aries/util/internal/DefaultWorker.java
URL:
http://svn.apache.org/viewvc/aries/branches/blueprint-0.3.2-fixes/util/src/main/java/org/apache/aries/util/internal/DefaultWorker.java?rev=1341241&r1=1341240&r2=1341241&view=diff
==============================================================================
---
aries/branches/blueprint-0.3.2-fixes/util/src/main/java/org/apache/aries/util/internal/DefaultWorker.java
(original)
+++
aries/branches/blueprint-0.3.2-fixes/util/src/main/java/org/apache/aries/util/internal/DefaultWorker.java
Mon May 21 22:44:38 2012
@@ -36,14 +36,29 @@ import org.osgi.framework.FrameworkUtil;
public class DefaultWorker implements FrameworkUtilWorker, BundleListener,
FrameworkListener
{
private Map<Bundle, ClassLoader> classLoaders = new IdentityHashMap<Bundle,
ClassLoader>();
- private static final Bundle myFrameworkBundle =
FrameworkUtil.getBundle(DefaultWorker.class).getBundleContext().getBundle(0);
+ private static final Bundle myFrameworkBundle;
+ static
+ {
+ Bundle bundle = FrameworkUtil.getBundle(DefaultWorker.class);
+ BundleContext myContext = bundle == null? null: bundle.getBundleContext();
+
+ // This may be created during framework shutdown when the bundle context
is null.
+ // So we need to cope and not NPE during construction.
+ if (myContext != null) {
+ myFrameworkBundle = myContext.getBundle(0);
+ } else {
+ myFrameworkBundle = null;
+ }
+ }
+
+
public ClassLoader getClassLoader(final Bundle b)
{
ClassLoader cl = get(b);
if (cl != null) return cl;
-
+
// so first off try to get the real classloader. We can do this by loading
a known class
// such as the bundle activator. There is no guarantee this will work, so
we have a back door too.
String activator = (String) b.getHeaders().get(Constants.BUNDLE_ACTIVATOR);
Added:
aries/branches/blueprint-0.3.2-fixes/util/src/main/java/org/apache/aries/util/internal/R43Worker.java
URL:
http://svn.apache.org/viewvc/aries/branches/blueprint-0.3.2-fixes/util/src/main/java/org/apache/aries/util/internal/R43Worker.java?rev=1341241&view=auto
==============================================================================
---
aries/branches/blueprint-0.3.2-fixes/util/src/main/java/org/apache/aries/util/internal/R43Worker.java
(added)
+++
aries/branches/blueprint-0.3.2-fixes/util/src/main/java/org/apache/aries/util/internal/R43Worker.java
Mon May 21 22:44:38 2012
@@ -0,0 +1,46 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
+package org.apache.aries.util.internal;
+
+import org.osgi.framework.Bundle;
+import org.osgi.framework.wiring.BundleWiring;
+
+/**
+ * @version $Rev:$ $Date:$
+ */
+public class R43Worker implements FrameworkUtilWorker {
+
+ static {
+ BundleWiring.class.getClassLoader();
+ }
+
+ public R43Worker() {
+ BundleWiring.class.getClassLoader();
+ }
+
+ public ClassLoader getClassLoader(Bundle b) {
+ return b.adapt(BundleWiring.class).getClassLoader();
+ }
+
+ public boolean isValid() {
+ return true;
+ }
+}
Modified:
aries/branches/blueprint-0.3.2-fixes/util/src/main/java/org/apache/aries/util/nls/MessageUtil.java
URL:
http://svn.apache.org/viewvc/aries/branches/blueprint-0.3.2-fixes/util/src/main/java/org/apache/aries/util/nls/MessageUtil.java?rev=1341241&r1=1341240&r2=1341241&view=diff
==============================================================================
---
aries/branches/blueprint-0.3.2-fixes/util/src/main/java/org/apache/aries/util/nls/MessageUtil.java
(original)
+++
aries/branches/blueprint-0.3.2-fixes/util/src/main/java/org/apache/aries/util/nls/MessageUtil.java
Mon May 21 22:44:38 2012
@@ -183,7 +183,7 @@ public final class MessageUtil
public Class<? extends ListResourceBundle> run()
{
try {
- return b.loadClass(bundleName);
+ return (Class<? extends ListResourceBundle>)
b.loadClass(bundleName);
} catch (ClassNotFoundException e) {
return null;
}
