Author: degenaro
Date: Thu Jun 30 14:54:09 2016
New Revision: 1750812
URL: http://svn.apache.org/viewvc?rev=1750812&view=rev
Log:
UIMA-4989 Fix problems found by FindBugs
Modified:
uima/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/UimaAsServiceMonitor.java
uima/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/aio/MessageHandler.java
uima/uima-ducc/trunk/uima-ducc-cli/src/test/java/org/apache/uima/ducc/cli/test/SubmitAndCancel.java
uima/uima-ducc/trunk/uima-ducc-cli/src/test/java/org/apache/uima/ducc/cli/test/TestCommandLine.java
Modified:
uima/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/UimaAsServiceMonitor.java
URL:
http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/UimaAsServiceMonitor.java?rev=1750812&r1=1750811&r2=1750812&view=diff
==============================================================================
---
uima/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/UimaAsServiceMonitor.java
(original)
+++
uima/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/UimaAsServiceMonitor.java
Thu Jun 30 14:54:09 2016
@@ -42,7 +42,7 @@ public class UimaAsServiceMonitor
private String broker_url;
private JMXConnector jmxc;
- BrokerViewMBean brokerMBean;
+ private BrokerViewMBean brokerMBean;
private QueueViewMBean monitoredQueue;
private IServiceStatistics qstats;
@@ -301,6 +301,7 @@ public class UimaAsServiceMonitor
enqueueCount = monitoredQueue.getEnqueueCount();
dispatchCount = monitoredQueue.getDispatchCount();
expiredCount = monitoredQueue.getExpiredCount();
+ monitoredQueue.resetStatistics();
} else {
enqueueTime = 0;
consumerCount = 0;
@@ -315,7 +316,6 @@ public class UimaAsServiceMonitor
expiredCount = 0;
}
- monitoredQueue.resetStatistics();
stop();
}
Modified:
uima/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/aio/MessageHandler.java
URL:
http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/aio/MessageHandler.java?rev=1750812&r1=1750811&r2=1750812&view=diff
==============================================================================
---
uima/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/aio/MessageHandler.java
(original)
+++
uima/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/aio/MessageHandler.java
Thu Jun 30 14:54:09 2016
@@ -78,7 +78,7 @@ public class MessageHandler implements I
}
public void setTimestamping(Toggle toggle) {
- synchronized(timestamping) {
+ synchronized(this) {
if(toggle != null) {
timestamping = toggle;
}
@@ -86,13 +86,13 @@ public class MessageHandler implements I
}
public Toggle getTimestamping() {
- synchronized(timestamping) {
+ synchronized(this) {
return timestamping;
}
}
public void setTypeIdentifying(Toggle toggle) {
- synchronized(typeIdentifying) {
+ synchronized(this) {
if(toggle != null) {
typeIdentifying = toggle;
}
@@ -100,7 +100,7 @@ public class MessageHandler implements I
}
public Toggle getTypeIdentifying() {
- synchronized(typeIdentifying) {
+ synchronized(this) {
return typeIdentifying;
}
}
Modified:
uima/uima-ducc/trunk/uima-ducc-cli/src/test/java/org/apache/uima/ducc/cli/test/SubmitAndCancel.java
URL:
http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-cli/src/test/java/org/apache/uima/ducc/cli/test/SubmitAndCancel.java?rev=1750812&r1=1750811&r2=1750812&view=diff
==============================================================================
---
uima/uima-ducc/trunk/uima-ducc-cli/src/test/java/org/apache/uima/ducc/cli/test/SubmitAndCancel.java
(original)
+++
uima/uima-ducc/trunk/uima-ducc-cli/src/test/java/org/apache/uima/ducc/cli/test/SubmitAndCancel.java
Thu Jun 30 14:54:09 2016
@@ -310,7 +310,12 @@ public class SubmitAndCancel
success(testid, "Job " + submit.getDuccId() + " not submitted,
rc = " + submit.getReturnCode());
}
} catch (Exception e) {
- success(testid, "Job " + submit.getDuccId() + " could not be
submitted.");
+ if(submit != null) {
+ success(testid, "Job " + submit.getDuccId() + " could
not be submitted.");
+ }
+ else {
+ success(testid, "Job " + "?" + " could not be
submitted.");
+ }
return;
}
Modified:
uima/uima-ducc/trunk/uima-ducc-cli/src/test/java/org/apache/uima/ducc/cli/test/TestCommandLine.java
URL:
http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-cli/src/test/java/org/apache/uima/ducc/cli/test/TestCommandLine.java?rev=1750812&r1=1750811&r2=1750812&view=diff
==============================================================================
---
uima/uima-ducc/trunk/uima-ducc-cli/src/test/java/org/apache/uima/ducc/cli/test/TestCommandLine.java
(original)
+++
uima/uima-ducc/trunk/uima-ducc-cli/src/test/java/org/apache/uima/ducc/cli/test/TestCommandLine.java
Thu Jun 30 14:54:09 2016
@@ -646,7 +646,7 @@ public class TestCommandLine
expected = null;
break;
}
- if ( expected == null && expected == cl.get(o) ) {
+ if ( expected == null ) {
success(testid, "Received expected null for",
o.pname());
} else if ( expected.equals(cl.get(o)) ) {
success(testid, "Received expected", expected, "for",
o.pname());
