Author: degenaro
Date: Fri Jun 24 14:08:41 2016
New Revision: 1750112
URL: http://svn.apache.org/viewvc?rev=1750112&view=rev
Log:
UIMA-4966 UIMA-DUCC Prepare for 2.1 Release
> fix 4 "Scary" find bugs errors in WS
Modified:
uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/MachineInfo.java
uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandler.java
uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/utils/alien/AlienWorkItemStateReader.java
Modified:
uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/MachineInfo.java
URL:
http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/MachineInfo.java?rev=1750112&r1=1750111&r2=1750112&view=diff
==============================================================================
---
uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/MachineInfo.java
(original)
+++
uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/MachineInfo.java
Fri Jun 24 14:08:41 2016
@@ -423,7 +423,7 @@ public class MachineInfo implements Comp
public boolean equals(Object object) {
boolean retVal = false;
if(object != null) {
- if(object instanceof NodeId) {
+ if(object instanceof MachineInfo) {
MachineInfo that = (MachineInfo) object;
retVal = (this.hashCode() == that.hashCode());
}
Modified:
uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandler.java
URL:
http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandler.java?rev=1750112&r1=1750111&r2=1750112&view=diff
==============================================================================
---
uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandler.java
(original)
+++
uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandler.java
Fri Jun 24 14:08:41 2016
@@ -2449,7 +2449,7 @@ public class DuccHandler extends DuccAbs
String link = logfile;
String reason =
process.getReasonForStoppingProcess();
if(reason != null) {
- if(reason.trim() != "")
{
+
if(reason.trim().length() > 0) {
link =
logfile+":"+reason;
}
}
@@ -2499,7 +2499,7 @@ public class DuccHandler extends DuccAbs
String link = logfile;
String reason =
process.getReasonForStoppingProcess();
if(reason != null) {
- if(reason.trim() != "")
{
+
if(reason.trim().length() > 0) {
link =
logfile+":"+reason;
}
}
Modified:
uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/utils/alien/AlienWorkItemStateReader.java
URL:
http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/utils/alien/AlienWorkItemStateReader.java?rev=1750112&r1=1750111&r2=1750112&view=diff
==============================================================================
---
uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/utils/alien/AlienWorkItemStateReader.java
(original)
+++
uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/utils/alien/AlienWorkItemStateReader.java
Fri Jun 24 14:08:41 2016
@@ -36,7 +36,7 @@ import com.google.gson.reflect.TypeToken
public class AlienWorkItemStateReader extends WorkItemStateReader {
- protected DuccLogger logger =
DuccLogger.getLogger(AlienWorkItemStateReader.class, null);
+ protected static DuccLogger logger =
DuccLogger.getLogger(AlienWorkItemStateReader.class, null);
private String user = null;
