From d67945472eb44ca74963d5c3359b28bb7334702d Mon Sep 17 00:00:00 2001
From: felmer <felmer>
Date: Tue, 12 Mar 2013 09:57:50 +0000
Subject: [PATCH] SP-481, BIS-317: log stack traces in warning logs. Improve
log message
SVN: 28595
---
.../server/OptimisticLockingRetryAdvisor.java | 13 ++++++++-----
1 file changed, 8 insertions(+), 5 deletions(-)
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/OptimisticLockingRetryAdvisor.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/OptimisticLockingRetryAdvisor.java
index 2086dc009f2..96a49251a7e 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/OptimisticLockingRetryAdvisor.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/OptimisticLockingRetryAdvisor.java
@@ -94,12 +94,11 @@ public class OptimisticLockingRetryAdvisor extends DefaultPointcutAdvisor
{
throw ex;
}
- boolean giveUp = i < NUMBER_OF_TRIES - 1;
- operationLog.warn((giveUp ? "" : "Giving up after the ") + (i + 1)
- + ". failed invocation of " + invocation.getMethod() + ". Reason: "
- + ex);
- if (giveUp == false)
+ boolean retry = i < NUMBER_OF_TRIES - 1;
+ if (retry)
{
+ operationLog.warn("Retry after the " + (i + 1) + ". failed invocation of "
+ + invocation.getMethod() + ". Reason: " + ex, ex);
try
{
Thread.sleep((int) (Math.random() * MAX_WAITING_TIME_FOR_RETRY));
@@ -107,6 +106,10 @@ public class OptimisticLockingRetryAdvisor extends DefaultPointcutAdvisor
{
// Ignored
}
+ } else
+ {
+ operationLog.error("Giving up after " + (i + 1) + ". failed invocation of "
+ + invocation.getMethod() + ". Reason: " + ex);
}
}
}
--
GitLab