Bug 548723 - Add event info to bundleStartTime trace message
Change-Id: I6237f09b6509cf67311af0929c2bd77b17eeaf06
Signed-off-by: Thomas Watson <tjwatson@us.ibm.com>
diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/Module.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/Module.java
index 4a8d7e7..3e38958 100644
--- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/Module.java
+++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/Module.java
@@ -485,7 +485,7 @@
publishEvent(event);
// only print bundleTime information if we actually fired an event for this bundle
if (container.DEBUG_BUNDLE_START_TIME) {
- Debug.println(TimeUnit.NANOSECONDS.toMillis(System.nanoTime() - startTime) + "ms for total start time of " + this); //$NON-NLS-1$
+ Debug.println(TimeUnit.NANOSECONDS.toMillis(System.nanoTime() - startTime) + " ms for total start time event " + event + " - " + this); //$NON-NLS-1$ //$NON-NLS-2$
}
}
diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/BundleContextImpl.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/BundleContextImpl.java
index 94920c0..5d900bf 100644
--- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/BundleContextImpl.java
+++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/BundleContextImpl.java
@@ -777,7 +777,7 @@
}
activator = loadBundleActivator();
if (debug.DEBUG_BUNDLE_TIME) {
- Debug.println((System.currentTimeMillis() - start) + "ms to load the activator of " + bundle); //$NON-NLS-1$
+ Debug.println((System.currentTimeMillis() - start) + " ms to load the activator of " + bundle); //$NON-NLS-1$
}
} catch (Exception e) {
if (e instanceof RuntimeException) {
@@ -794,7 +794,7 @@
throw be;
} finally {
if (debug.DEBUG_BUNDLE_TIME) {
- Debug.println((System.currentTimeMillis() - start) + "ms to load and start the activator of " + bundle); //$NON-NLS-1$
+ Debug.println((System.currentTimeMillis() - start) + " ms to load and start the activator of " + bundle); //$NON-NLS-1$
}
}
}
