Bug 537322 - Improved logging in exception case of flushMarkerCacheY20180725-2200I20180726-2000I20180725-2000I20180724-2000

Whenever an exception occurs during marker attribute setting in
BreakpointWorkingSetCache.flushMarkerCache, the logged error does not
include information for the attributes which are to be set on the
marker. When logged e.g. from tests, its difficult to understand where
the logged error is coming from.

This change adds some extra information to the logged error.

Change-Id: I0b9a1aadb9310b26778f200df4004cdbb8756eef
Signed-off-by: Simeon Andreev <simeon.danailov.andreev@gmail.com>

1 files changed, 5 insertions, 1 deletions

diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/breakpoints/BreakpointWorkingSetCache.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/breakpoints/BreakpointWorkingSetCache.java
index 5720696d6..7ae72879b 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/breakpoints/BreakpointWorkingSetCache.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/breakpoints/BreakpointWorkingSetCache.java
@@ -19,6 +19,7 @@ import org.eclipse.core.runtime.CoreException;
 import org.eclipse.debug.core.DebugPlugin;
 import org.eclipse.debug.internal.ui.IInternalDebugUIConstants;
 import org.eclipse.debug.internal.ui.importexport.breakpoints.IImportExportConstants;
+import org.eclipse.osgi.util.NLS;
 import org.eclipse.ui.IWorkingSet;
 import org.eclipse.ui.IWorkingSetManager;
 import org.eclipse.ui.PlatformUI;
@@ -98,8 +99,11 @@ public class BreakpointWorkingSetCache {
 			try {
 				marker.setAttribute(IInternalDebugUIConstants.WORKING_SET_NAME, names);
 				marker.setAttribute(IInternalDebugUIConstants.WORKING_SET_ID, ids);
+			} catch (CoreException e) {
+				Object[] errorInfo = { names, ids, marker };
+				String errorMessage = NLS.bind("Failed to set working set names {0} and ids {1} on marker {2}", errorInfo); //$NON-NLS-1$
+				DebugPlugin.logMessage(errorMessage, e);
 			}
-			catch(CoreException e) {DebugPlugin.log(e);}
 		}
 	}