Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorslewis2015-07-15 11:24:21 -0400
committerslewis2015-07-15 11:24:21 -0400
commit9d9ee4eb8b39f8e89bbea847ee092efbde1f6025 (patch)
tree546e12c3d2ffa0d50751c4e03d1981542887be28 /framework/bundles/org.eclipse.ecf.identity/src
parentff21e86783278297ad9d46776dd11e0b8837580b (diff)
downloadorg.eclipse.ecf-9d9ee4eb8b39f8e89bbea847ee092efbde1f6025.tar.gz
org.eclipse.ecf-9d9ee4eb8b39f8e89bbea847ee092efbde1f6025.tar.xz
org.eclipse.ecf-9d9ee4eb8b39f8e89bbea847ee092efbde1f6025.zip
Improved fix for https://bugs.eclipse.org/bugs/show_bug.cgi?id=472661
Diffstat (limited to 'framework/bundles/org.eclipse.ecf.identity/src')
-rw-r--r--framework/bundles/org.eclipse.ecf.identity/src/org/eclipse/ecf/core/util/Trace.java18
1 files changed, 3 insertions, 15 deletions
diff --git a/framework/bundles/org.eclipse.ecf.identity/src/org/eclipse/ecf/core/util/Trace.java b/framework/bundles/org.eclipse.ecf.identity/src/org/eclipse/ecf/core/util/Trace.java
index cbd97a3f3..87cf9c552 100644
--- a/framework/bundles/org.eclipse.ecf.identity/src/org/eclipse/ecf/core/util/Trace.java
+++ b/framework/bundles/org.eclipse.ecf.identity/src/org/eclipse/ecf/core/util/Trace.java
@@ -147,13 +147,6 @@ public class Trace {
*/
private static final Map<String, Boolean> cachedOptions = new HashMap<String, Boolean>();
- private static boolean tracePluginsStartsWith(String option) {
- for (String s : TRACE_BUNDLES)
- if (option.startsWith(s))
- return true;
- return false;
- }
-
/**
* Retrieves a Boolean value indicating whether tracing is enabled for the
* specified plug-in.
@@ -165,19 +158,12 @@ public class Trace {
*
*/
protected static boolean shouldTrace(String pluginId) {
- if (TRACEALL)
- return true;
- else if (TRACE_BUNDLES.contains(pluginId))
- return true;
- else
- return shouldTrace0(pluginId + "/debug"); //$NON-NLS-1$
+ return shouldTrace0(pluginId + "/debug"); //$NON-NLS-1$
}
protected static boolean shouldTrace0(String option) {
if (option == null)
return false;
- if (TRACEALL || tracePluginsStartsWith(option))
- return true;
Activator activator = Activator.getDefault();
if (activator == null)
return false;
@@ -202,6 +188,8 @@ public class Trace {
public static boolean shouldTrace(String pluginId, String option) {
if (pluginId == null)
return false;
+ if (TRACEALL || TRACE_BUNDLES.contains(pluginId))
+ return true;
if (shouldTrace(pluginId)) {
Boolean value = null;

Back to the top