Author: rsivaram
Date: Mon Mar 17 02:19:24 2008
New Revision: 637797
URL: http://svn.apache.org/viewvc?rev=637797&view=rev
Log:
Ignore errors when OSGi runtime not on classpath
Modified:
incubator/tuscany/java/sca/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/ClassReferenceModelResolver.java
incubator/tuscany/java/sca/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiClassReferenceModelResolver.java
incubator/tuscany/java/sca/modules/osgi-runtime/src/main/java/org/apache/tuscany/sca/osgi/runtime/OSGiRuntimeModuleActivator.java
Modified:
incubator/tuscany/java/sca/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/ClassReferenceModelResolver.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/ClassReferenceModelResolver.java?rev=637797&r1=637796&r2=637797&view=diff
==============================================================================
---
incubator/tuscany/java/sca/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/ClassReferenceModelResolver.java
(original)
+++
incubator/tuscany/java/sca/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/ClassReferenceModelResolver.java
Mon Mar 17 02:19:24 2008
@@ -63,7 +63,8 @@
osgiResolverClass.getConstructor(Contribution.class,
ModelFactoryExtensionPoint.class);
this.osgiResolver =
(ModelResolver)constructor.newInstance(contribution, modelFactories);
}
- } catch (Exception e) {
+ } catch (Throwable e) {
+ // Ignore error, non-OSGi classloading is used in this case
}
}
Modified:
incubator/tuscany/java/sca/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiClassReferenceModelResolver.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiClassReferenceModelResolver.java?rev=637797&r1=637796&r2=637797&view=diff
==============================================================================
---
incubator/tuscany/java/sca/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiClassReferenceModelResolver.java
(original)
+++
incubator/tuscany/java/sca/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiClassReferenceModelResolver.java
Mon Mar 17 02:19:24 2008
@@ -40,6 +40,7 @@
private Map<String, ClassReference> map = new HashMap<String,
ClassReference>();
private Bundle bundle;
private boolean initialized;
+ private boolean useOSGi;
public OSGiClassReferenceModelResolver(Contribution contribution,
ModelFactoryExtensionPoint modelFactories) {
this.contribution = contribution;
@@ -83,6 +84,8 @@
return modelClass.cast(resolved);
}
initialize();
+ if (!useOSGi)
+ return unresolved;
//Load a class on demand
Class clazz = null;
@@ -126,7 +129,9 @@
initialized = true;
try {
bundle =
OSGiRuntime.findInstalledBundle(contribution.getLocation());
- } catch (Exception e) {
+ useOSGi = bundle != null;
+ } catch (Throwable e) {
+ // Ignore errors, default to ClassReferenceModelResolver
}
}
}
Modified:
incubator/tuscany/java/sca/modules/osgi-runtime/src/main/java/org/apache/tuscany/sca/osgi/runtime/OSGiRuntimeModuleActivator.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/osgi-runtime/src/main/java/org/apache/tuscany/sca/osgi/runtime/OSGiRuntimeModuleActivator.java?rev=637797&r1=637796&r2=637797&view=diff
==============================================================================
---
incubator/tuscany/java/sca/modules/osgi-runtime/src/main/java/org/apache/tuscany/sca/osgi/runtime/OSGiRuntimeModuleActivator.java
(original)
+++
incubator/tuscany/java/sca/modules/osgi-runtime/src/main/java/org/apache/tuscany/sca/osgi/runtime/OSGiRuntimeModuleActivator.java
Mon Mar 17 02:19:24 2008
@@ -39,7 +39,7 @@
public void stop(ExtensionPointRegistry registry) {
try {
OSGiRuntime.stop();
- } catch (Exception e) {
+ } catch (Throwable e) {
// Ignore the exception
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
