Bug 402478 - [coordinator] Be less aggressive with log messages when processing orphaned coordinations.v20130305-204346I20130306-2330I20130306-2000I20130306-1518

Changed unexpected exception logging when failing an orphaned coordination from ERROR to WARNING.

Changed unexpected exception logging when ending an orphaned coordination from ERROR to WARNING.

Changed unexpected coordination exception failure cause logging from ERROR to DEBUG.

Exception instead of Throwable now caught.

Updated copyrights, including one from previous change in CoordinationImpl.

2 files changed, 7 insertions, 7 deletions

diff --git a/bundles/org.eclipse.equinox.coordinator/src/org/eclipse/equinox/coordinator/CoordinationWeakReference.java b/bundles/org.eclipse.equinox.coordinator/src/org/eclipse/equinox/coordinator/CoordinationWeakReference.java
index 7c7d90ca4..33d5ef4ae 100644
--- a/bundles/org.eclipse.equinox.coordinator/src/org/eclipse/equinox/coordinator/CoordinationWeakReference.java
+++ b/bundles/org.eclipse.equinox.coordinator/src/org/eclipse/equinox/coordinator/CoordinationWeakReference.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2011 IBM Corporation and others.
+ * Copyright (c) 2011, 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
@@ -28,8 +28,8 @@ public class CoordinationWeakReference extends WeakReference<CoordinationReferen
 			try {
 				c.fail(Coordination.ORPHANED);
 			}
-			catch (Throwable t) {
-				c.getLogService().log(LogService.LOG_ERROR, NLS.bind(Messages.OrphanedCoordinationError, c.getName(), c.getId()), t);
+			catch (Exception e) {
+				c.getLogService().log(LogService.LOG_WARNING, NLS.bind(Messages.OrphanedCoordinationError, c.getName(), c.getId()), e);
 			}
 			finally {
 				try {
@@ -39,10 +39,10 @@ public class CoordinationWeakReference extends WeakReference<CoordinationReferen
 					// This is expected since we already failed the coordination...
 					if (!Coordination.ORPHANED.equals(e.getCause()))
 						// ...but only if the cause is ORPHANED.
-						c.getLogService().log(LogService.LOG_ERROR, NLS.bind(Messages.OrphanedCoordinationError, c.getName(), c.getId()), e);
+						c.getLogService().log(LogService.LOG_DEBUG, NLS.bind(Messages.OrphanedCoordinationError, c.getName(), c.getId()), e);
 				}
-				catch (Throwable t) {
-					c.getLogService().log(LogService.LOG_ERROR, NLS.bind(Messages.OrphanedCoordinationError, c.getName(), c.getId()), t);
+				catch (Exception e) {
+					c.getLogService().log(LogService.LOG_WARNING, NLS.bind(Messages.OrphanedCoordinationError, c.getName(), c.getId()), e);
 				}
 			}
 		}
diff --git a/bundles/org.eclipse.equinox.coordinator/src/org/eclipse/equinox/coordinator/CoordinatorImpl.java b/bundles/org.eclipse.equinox.coordinator/src/org/eclipse/equinox/coordinator/CoordinatorImpl.java
index ed3ebe3ef..1f2b5a6d5 100644
--- a/bundles/org.eclipse.equinox.coordinator/src/org/eclipse/equinox/coordinator/CoordinatorImpl.java
+++ b/bundles/org.eclipse.equinox.coordinator/src/org/eclipse/equinox/coordinator/CoordinatorImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2011 IBM Corporation and others.
+ * Copyright (c) 2010, 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