summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Stepper2006-10-27 02:58:49 (EDT)
committerEike Stepper2006-10-27 02:58:49 (EDT)
commitf4f66edd31ca4c0f4ea629af2d9cf71b8274496d (patch)
treee90f51322d25feb74450b4bcd03483615e208d2c
parent1a8e413c5d947d2acb00c0d8c431eb5aee736f86 (diff)
downloadcdo-f4f66edd31ca4c0f4ea629af2d9cf71b8274496d.zip
cdo-f4f66edd31ca4c0f4ea629af2d9cf71b8274496d.tar.gz
cdo-f4f66edd31ca4c0f4ea629af2d9cf71b8274496d.tar.bz2
Operations & Maintenance
-rw-r--r--plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/bundle/AbstractOMBundle.java4
-rw-r--r--plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/bundle/AbstractOMPlatform.java11
2 files changed, 10 insertions, 5 deletions
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/bundle/AbstractOMBundle.java b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/bundle/AbstractOMBundle.java
index 7699045..9a1657f 100644
--- a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/bundle/AbstractOMBundle.java
+++ b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/bundle/AbstractOMBundle.java
@@ -157,7 +157,7 @@ public abstract class AbstractOMBundle implements OMBundle
platform.setDebugOption(bundleID, option, value);
}
- public OMTracer tracer(String name)
+ public synchronized OMTracer tracer(String name)
{
OMTracer tracer = tracers.get(name);
if (tracer == null)
@@ -168,7 +168,7 @@ public abstract class AbstractOMBundle implements OMBundle
return tracer;
}
- public OMLogger logger()
+ public synchronized OMLogger logger()
{
if (logger == null)
{
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/bundle/AbstractOMPlatform.java b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/bundle/AbstractOMPlatform.java
index c58f839..6c8b90f 100644
--- a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/bundle/AbstractOMPlatform.java
+++ b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/bundle/AbstractOMPlatform.java
@@ -46,7 +46,7 @@ public abstract class AbstractOMPlatform implements OMPlatform
debugging = Boolean.parseBoolean(System.getProperty("debug", "false"));
}
- public OMBundle bundle(String bundleID, Class accessor)
+ public synchronized OMBundle bundle(String bundleID, Class accessor)
{
OMBundle bundle = bundles.get(bundleID);
if (bundle == null)
@@ -135,7 +135,10 @@ public abstract class AbstractOMPlatform implements OMPlatform
protected abstract void setDebugOption(String bundleID, String option, String value);
- public static OMPlatform createPlatform()
+ /**
+ * TODO Make configurable via system property
+ */
+ public static synchronized OMPlatform createPlatform()
{
try
{
@@ -143,6 +146,8 @@ public abstract class AbstractOMPlatform implements OMPlatform
{
return new OSGiPlatform(systemContext);
}
+
+ return new LegacyPlatform();
}
catch (Exception ex)
{
@@ -152,7 +157,7 @@ public abstract class AbstractOMPlatform implements OMPlatform
}
}
- return new LegacyPlatform();
+ return null;
}
private static ContextTracer TRACER()