Author: degenaro
Date: Tue Jun 28 13:16:37 2016
New Revision: 1750503
URL: http://svn.apache.org/viewvc?rev=1750503&view=rev
Log:
UIMA-4989 Fix problems found by FindBugs
Modified:
uima/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/fsm/wi/ActionGet.java
uima/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/fsm/wi/ActionGetRedux.java
Modified:
uima/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/fsm/wi/ActionGet.java
URL:
http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/fsm/wi/ActionGet.java?rev=1750503&r1=1750502&r2=1750503&view=diff
==============================================================================
---
uima/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/fsm/wi/ActionGet.java
(original)
+++
uima/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/fsm/wi/ActionGet.java
Tue Jun 28 13:16:37 2016
@@ -182,18 +182,19 @@ public class ActionGet implements IActio
JobProcessBlacklist jobProcessBlacklist =
JobProcessBlacklist.getInstance();
IMetaMetaCas mmc = getMetaMetaCas(actionData);
if(mmc.isExhausted()) {
- if(!warnedExhausted.containsKey(rwp)) {
+ Long time =
warnedExhausted.putIfAbsent(rwp, new Long(System.currentTimeMillis()));
+ if(time != null) {
MessageBuffer mbx =
LoggerHelper.getMessageBuffer(actionData);
mbx.append(Standardize.Label.node.get()+rwp.getNodeName());
mbx.append(Standardize.Label.pid.get()+rwp.getPid());
mbx.append(Standardize.Label.text.get()+allCasesProcessed);
logger.debug(location,
ILogger.null_id, mbx.toString());
- warnedExhausted.put(rwp, new
Long(System.currentTimeMillis()));
}
TransactionHelper.addResponseHint(trans, Hint.Exhausted);
}
if(mmc.isPremature()) {
- if(!warnedExhausted.containsKey(rwp)) {
+ Long time =
warnedPremature.putIfAbsent(rwp, new Long(System.currentTimeMillis()));
+ if(time != null) {
String text =
fewerWorkItemsAvailableThanExpected;
jd.killJob(CompletionType.Exception, text);
MessageBuffer mbx =
LoggerHelper.getMessageBuffer(actionData);
@@ -201,29 +202,28 @@ public class ActionGet implements IActio
mbx.append(Standardize.Label.pid.get()+rwp.getPid());
mbx.append(Standardize.Label.text.get()+text);
logger.debug(location,
ILogger.null_id, mbx.toString());
- warnedExhausted.put(rwp, new
Long(System.currentTimeMillis()));
}
TransactionHelper.addResponseHint(trans, Hint.Premature);
}
else if(mmc.isKillJob()) {
-
if(!warnedJobDiscontinued.containsKey(rwp)) {
+ Long time =
warnedJobDiscontinued.putIfAbsent(rwp, new Long(System.currentTimeMillis()));
+ if(time != null) {
MessageBuffer mb =
LoggerHelper.getMessageBuffer(actionData);
mb.append(Standardize.Label.node.get()+rwp.getNodeName());
mb.append(Standardize.Label.pid.get()+rwp.getPid());
mb.append(Standardize.Label.text.get()+"job discontinued");
logger.warn(location,
ILogger.null_id, mb.toString());
- warnedJobDiscontinued.put(rwp,
new Long(System.currentTimeMillis()));
}
TransactionHelper.addResponseHint(trans, Hint.Killed);
}
else if(jobProcessBlacklist.includes(rwp)) {
-
if(!warnedProcessDiscontinued.containsKey(rwp)) {
+ Long time =
warnedProcessDiscontinued.put(rwp, new Long(System.currentTimeMillis()));
+ if(time != null) {
MessageBuffer mb =
LoggerHelper.getMessageBuffer(actionData);
mb.append(Standardize.Label.node.get()+rwp.getNodeName());
mb.append(Standardize.Label.pid.get()+rwp.getPid());
mb.append(Standardize.Label.text.get()+"process discontinued");
logger.warn(location,
ILogger.null_id, mb.toString());
-
warnedProcessDiscontinued.put(rwp, new Long(System.currentTimeMillis()));
}
TransactionHelper.addResponseHint(trans, Hint.Blacklisted);
}
@@ -260,18 +260,19 @@ public class ActionGet implements IActio
mb.append("No CAS found for
processing");
logger.debug(location, ILogger.null_id,
mb.toString());
if(mmc.isExhausted()) {
-
if(!warnedExhausted.containsKey(rwp)) {
+ Long time =
warnedExhausted.put(rwp, new Long(System.currentTimeMillis()));
+ if(time == null) {
MessageBuffer mbx =
LoggerHelper.getMessageBuffer(actionData);
mbx.append(Standardize.Label.node.get()+rwp.getNodeName());
mbx.append(Standardize.Label.pid.get()+rwp.getPid());
mbx.append(Standardize.Label.text.get()+allCasesProcessed);
logger.warn(location,
ILogger.null_id, mbx.toString());
-
warnedExhausted.put(rwp, new Long(System.currentTimeMillis()));
}
TransactionHelper.addResponseHint(trans, Hint.Exhausted);
}
if(mmc.isPremature()) {
-
if(!warnedPremature.containsKey(rwp)) {
+ Long time =
warnedPremature.put(rwp, new Long(System.currentTimeMillis()));
+ if(time == null) {
String text =
fewerWorkItemsAvailableThanExpected;
jd.killJob(CompletionType.Exception, text);
MessageBuffer mbx =
LoggerHelper.getMessageBuffer(actionData);
@@ -279,7 +280,7 @@ public class ActionGet implements IActio
mbx.append(Standardize.Label.pid.get()+rwp.getPid());
mbx.append(Standardize.Label.text.get()+text);
logger.debug(location,
ILogger.null_id, mbx.toString());
-
warnedPremature.put(rwp, new Long(System.currentTimeMillis()));
+
}
TransactionHelper.addResponseHint(trans, Hint.Premature);
}
Modified:
uima/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/fsm/wi/ActionGetRedux.java
URL:
http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/fsm/wi/ActionGetRedux.java?rev=1750503&r1=1750502&r2=1750503&view=diff
==============================================================================
---
uima/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/fsm/wi/ActionGetRedux.java
(original)
+++
uima/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/fsm/wi/ActionGetRedux.java
Tue Jun 28 13:16:37 2016
@@ -50,9 +50,8 @@ public class ActionGetRedux implements I
IRemoteWorkerThread rwt =
actionData.getRemoteWorkerThread();
WiTracker tracker = WiTracker.getInstance();
IWorkItem wi = tracker.find(rwt);
- IFsm fsm = wi.getFsm();
- IEvent event = WiFsm.CAS_Unavailable;
if(wi != null) {
+ IEvent event = WiFsm.CAS_Unavailable;
IMetaCas metaCas = wi.getMetaCas();
if(metaCas != null) {
event = WiFsm.CAS_Available;
@@ -66,9 +65,14 @@ public class ActionGetRedux implements I
mb.append("No CAS found for
processing");
logger.info(location,
ILogger.null_id, mb.toString());
}
+ IFsm fsm = wi.getFsm();
+ fsm.transition(event, actionData);
+ }
+ else {
+ MessageBuffer mb =
LoggerHelper.getMessageBuffer(actionData);
+ mb.append("No work item found for
processing");
+ logger.warn(location, ILogger.null_id,
mb.toString());
}
- //
- fsm.transition(event, actionData);
}
else {
MessageBuffer mb =
LoggerHelper.getMessageBuffer(actionData);
