diff options
| author | Thomas Watson | 2013-08-13 19:10:07 +0000 |
|---|---|---|
| committer | Thomas Watson | 2013-08-13 19:10:07 +0000 |
| commit | 95ca4f9a9f10af8181f422f73ac6d6e60b571c7f (patch) | |
| tree | dd7f176380194a63a649d7c1d5bfdcf3b1181d64 | |
| parent | 079ff4f24d6712de08a071dc1b1b4fd3b90d8d05 (diff) | |
| download | rt.equinox.bundles-95ca4f9a9f10af8181f422f73ac6d6e60b571c7f.tar.gz rt.equinox.bundles-95ca4f9a9f10af8181f422f73ac6d6e60b571c7f.tar.xz rt.equinox.bundles-95ca4f9a9f10af8181f422f73ac6d6e60b571c7f.zip | |
Bug 408686 - [DS] Incorrect error logging in
org.eclipse.equinox.internal.ds.Activator
3 files changed, 5 insertions, 4 deletions
diff --git a/bundles/org.eclipse.equinox.ds/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.ds/META-INF/MANIFEST.MF index 9857171c8..dbeb684cb 100644 --- a/bundles/org.eclipse.equinox.ds/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.equinox.ds/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %bundleName Bundle-SymbolicName: org.eclipse.equinox.ds;singleton:=true -Bundle-Version: 1.4.100.qualifier +Bundle-Version: 1.4.200.qualifier Bundle-Vendor: %bundleVendor Bundle-Activator: org.eclipse.equinox.internal.ds.Activator Bundle-Description: This bundle provides support for OSGi diff --git a/bundles/org.eclipse.equinox.ds/pom.xml b/bundles/org.eclipse.equinox.ds/pom.xml index 4fd4424b9..db868f74e 100644 --- a/bundles/org.eclipse.equinox.ds/pom.xml +++ b/bundles/org.eclipse.equinox.ds/pom.xml @@ -19,6 +19,6 @@ </parent> <groupId>org.eclipse.equinox</groupId> <artifactId>org.eclipse.equinox.ds</artifactId> - <version>1.4.100-SNAPSHOT</version> + <version>1.4.200-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project> diff --git a/bundles/org.eclipse.equinox.ds/src/org/eclipse/equinox/internal/ds/Activator.java b/bundles/org.eclipse.equinox.ds/src/org/eclipse/equinox/internal/ds/Activator.java index add5e0138..28d6e8ed2 100644 --- a/bundles/org.eclipse.equinox.ds/src/org/eclipse/equinox/internal/ds/Activator.java +++ b/bundles/org.eclipse.equinox.ds/src/org/eclipse/equinox/internal/ds/Activator.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 1997, 2010 by ProSyst Software GmbH + * Copyright (c) 1997, 2013 by ProSyst Software GmbH * http://www.prosyst.com * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 @@ -381,7 +381,8 @@ public class Activator implements BundleActivator, SynchronousBundleListener, Se } private static void dumpOnConsole(String prefix, BundleContext bundleContext, String msg, Throwable t, boolean printInErr) { - String message = prefix + bundleContext.getBundle().getBundleId() + " " + msg; //$NON-NLS-1$ + String id = (bundleContext == null) ? "SCR " : bundleContext.getBundle().getBundleId() + " "; //$NON-NLS-1$//$NON-NLS-2$ + String message = prefix + id + msg; if (printInErr) { System.err.println(message); } else { |