diff options
| author | Christian Georgi | 2013-03-16 11:53:46 +0000 |
|---|---|---|
| committer | Thomas Watson | 2013-04-02 15:05:12 +0000 |
| commit | 10b493b9c3385e09d3d7f4d35f1f357604dfb058 (patch) | |
| tree | 66083e6f520b4e7404f71c7b93cc1993f07ccde2 | |
| parent | 452e0c8dae5a52ad9bb97e073caa16b40c3c1eee (diff) | |
| download | rt.equinox.bundles-10b493b9c3385e09d3d7f4d35f1f357604dfb058.tar.gz rt.equinox.bundles-10b493b9c3385e09d3d7f4d35f1f357604dfb058.tar.xz rt.equinox.bundles-10b493b9c3385e09d3d7f4d35f1f357604dfb058.zip | |
Bug 404233 - NPE when clearing trace file
| -rw-r--r-- | bundles/org.eclipse.equinox.common/META-INF/MANIFEST.MF | 2 | ||||
| -rw-r--r-- | bundles/org.eclipse.equinox.common/src/org/eclipse/core/internal/runtime/DataArea.java | 8 |
2 files changed, 7 insertions, 3 deletions
diff --git a/bundles/org.eclipse.equinox.common/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.common/META-INF/MANIFEST.MF index a5842e7b4..edb8f7f9e 100644 --- a/bundles/org.eclipse.equinox.common/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.equinox.common/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.equinox.common; singleton:=true -Bundle-Version: 3.6.100.qualifier +Bundle-Version: 3.6.200.qualifier Bundle-Localization: plugin Export-Package: org.eclipse.core.internal.boot;x-friends:="org.eclipse.core.resources,org.eclipse.core.runtime.compatibility,org.eclipse.pde.build", org.eclipse.core.internal.runtime;common=split;mandatory:=common; diff --git a/bundles/org.eclipse.equinox.common/src/org/eclipse/core/internal/runtime/DataArea.java b/bundles/org.eclipse.equinox.common/src/org/eclipse/core/internal/runtime/DataArea.java index 1e8d37d41..66d9feee7 100644 --- a/bundles/org.eclipse.equinox.common/src/org/eclipse/core/internal/runtime/DataArea.java +++ b/bundles/org.eclipse.equinox.common/src/org/eclipse/core/internal/runtime/DataArea.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2004, 2009 IBM Corporation and others. + * Copyright (c) 2004, 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 @@ -97,7 +97,11 @@ public class DataArea { if (debugOptions == null) { return null; } - return new Path(debugOptions.getFile().getAbsolutePath()); + File file = debugOptions.getFile(); + if (file == null) { + return null; + } + return new Path(file.getAbsolutePath()); } /** |