diff options
author | Thomas Watson | 2013-04-04 15:00:15 +0000 |
---|---|---|
committer | Thomas Watson | 2013-04-04 15:00:15 +0000 |
commit | 6190c8574ddda49ac9d5eb3afbd7484124fbe01d (patch) | |
tree | f5e85755a2f305a922e12d71c789a58f52bd2d5b /bundles/org.eclipse.osgi/supplement/src | |
parent | 3d64df184a8f9dfc304a0312da0d5c1301ce5aee (diff) | |
parent | aaeeb05df81b83e0e67697ea1d0617923263ec51 (diff) | |
download | rt.equinox.framework-6190c8574ddda49ac9d5eb3afbd7484124fbe01d.tar.gz rt.equinox.framework-6190c8574ddda49ac9d5eb3afbd7484124fbe01d.tar.xz rt.equinox.framework-6190c8574ddda49ac9d5eb3afbd7484124fbe01d.zip |
Merge branch 'master' into twatson/container
Conflicts:
bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/internal/debug/FrameworkDebugOptions.java
Diffstat (limited to 'bundles/org.eclipse.osgi/supplement/src')
-rw-r--r-- | bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/internal/debug/FrameworkDebugOptions.java | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/internal/debug/FrameworkDebugOptions.java b/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/internal/debug/FrameworkDebugOptions.java index 71fe5a28a..7c6c13ed7 100644 --- a/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/internal/debug/FrameworkDebugOptions.java +++ b/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/internal/debug/FrameworkDebugOptions.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2003, 2010 IBM Corporation and others. + * Copyright (c) 2003, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -420,7 +420,10 @@ public class FrameworkDebugOptions implements DebugOptions, ServiceTrackerCustom public synchronized void setFile(final File traceFile) { this.outFile = traceFile; - environmentInfo.setConfiguration(PROP_TRACEFILE, this.outFile.getAbsolutePath()); + if (this.outFile != null) + environmentInfo.setConfiguration(PROP_TRACEFILE, this.outFile.getAbsolutePath()); + else + environmentInfo.clearConfiguration(PROP_TRACEFILE); // the file changed so start a new session EclipseDebugTrace.newSession = true; } @@ -495,4 +498,4 @@ public class FrameworkDebugOptions implements DebugOptions, ServiceTrackerCustom public void removedService(ServiceReference<DebugOptionsListener> reference, DebugOptionsListener service) { context.ungetService(reference); } -}
\ No newline at end of file +} |