Author: degenaro
Date: Sat Jun 25 10:57:37 2016
New Revision: 1750198
URL: http://svn.apache.org/viewvc?rev=1750198&view=rev
Log:
UIMA-4989 Fix problems found by FindBugs
Modified:
uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/DuccMachinesData.java
uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/Info.java
uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/JobInfo.java
uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/ReservationInfo.java
uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/registry/sort/SortableService.java
uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccAbstractHandler.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/server/DuccHandlerClassic.java
uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccWebMonitorJob.java
uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccWebMonitorManagedReservation.java
uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccWebMonitorReservation.java
uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/sort/JobDetailsProcesses.java
uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/types/Ip.java
Modified:
uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/DuccMachinesData.java
URL:
http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/DuccMachinesData.java?rev=1750198&r1=1750197&r2=1750198&view=diff
==============================================================================
---
uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/DuccMachinesData.java
(original)
+++
uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/DuccMachinesData.java
Sat Jun 25 10:57:37 2016
@@ -201,6 +201,10 @@ public class DuccMachinesData {
return retVal;
}
+ private static void
setSortedMachines(ConcurrentSkipListMap<MachineInfo,NodeId> value) {
+ sortedMachines = value;
+ }
+
public void updateSortedMachines() {
String location = "updateSortedMachines";
logger.debug(location, jobid, "start");
@@ -215,7 +219,7 @@ public class DuccMachinesData {
map.put(machineInfo, nodeId);
logger.debug(location, jobid, "put: "+nodeId);
}
- sortedMachines = map;
+ setSortedMachines(map);
updateMachineFactsList();
}
catch(Exception e) {
Modified:
uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/Info.java
URL:
http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/Info.java?rev=1750198&r1=1750197&r2=1750198&view=diff
==============================================================================
---
uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/Info.java
(original)
+++
uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/Info.java
Sat Jun 25 10:57:37 2016
@@ -86,18 +86,20 @@ public class Info implements Comparable<
public boolean equals(Object object) {
boolean retVal = false;
- try {
- IDuccWork dw1 = this._dw;
- IDuccWork dw2 = (IDuccWork)object;
- String s1 = dw1.getDuccId().toString();
- String s2 = dw2.getDuccId().toString();
- DuccType dt1 = dw1.getDuccType();
- DuccType dt2 = dw2.getDuccType();
- if(dt1 == dt2) {
- retVal = s1.equals(s2);
+ if(object != null) {
+ try {
+ IDuccWork dw1 = this._dw;
+ IDuccWork dw2 = (IDuccWork)object;
+ String s1 = dw1.getDuccId().toString();
+ String s2 = dw2.getDuccId().toString();
+ DuccType dt1 = dw1.getDuccType();
+ DuccType dt2 = dw2.getDuccType();
+ if(dt1 == dt2) {
+ retVal = s1.equals(s2);
+ }
+ }
+ catch(Throwable t) {
}
- }
- catch(Throwable t) {
}
return retVal;
}
Modified:
uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/JobInfo.java
URL:
http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/JobInfo.java?rev=1750198&r1=1750197&r2=1750198&view=diff
==============================================================================
---
uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/JobInfo.java
(original)
+++
uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/JobInfo.java
Sat Jun 25 10:57:37 2016
@@ -63,16 +63,18 @@ public class JobInfo implements Comparab
public boolean equals(Object object) {
boolean retVal = false;
- try {
- JobInfo i1 = this;
- JobInfo i2 = (JobInfo)object;
- DuccWorkJob j1 = i1.getJob();
- DuccWorkJob j2 = i2.getJob();
- String s1 = j1.getDuccId().toString();
- String s2 = j2.getDuccId().toString();
- retVal = s1.equals(s2);
- }
- catch(Throwable t) {
+ if(object != null) {
+ try {
+ JobInfo i1 = this;
+ JobInfo i2 = (JobInfo)object;
+ DuccWorkJob j1 = i1.getJob();
+ DuccWorkJob j2 = i2.getJob();
+ String s1 = j1.getDuccId().toString();
+ String s2 = j2.getDuccId().toString();
+ retVal = s1.equals(s2);
+ }
+ catch(Throwable t) {
+ }
}
return retVal;
}
Modified:
uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/ReservationInfo.java
URL:
http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/ReservationInfo.java?rev=1750198&r1=1750197&r2=1750198&view=diff
==============================================================================
---
uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/ReservationInfo.java
(original)
+++
uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/ReservationInfo.java
Sat Jun 25 10:57:37 2016
@@ -63,16 +63,18 @@ public class ReservationInfo implements
public boolean equals(Object object) {
boolean retVal = false;
- try {
- ReservationInfo i1 = this;
- ReservationInfo i2 = (ReservationInfo)object;
- DuccWorkReservation j1 = i1.getReservation();
- DuccWorkReservation j2 = i2.getReservation();
- String s1 = j1.getDuccId().toString();
- String s2 = j2.getDuccId().toString();
- retVal = s1.equals(s2);
- }
- catch(Throwable t) {
+ if(object != null) {
+ try {
+ ReservationInfo i1 = this;
+ ReservationInfo i2 = (ReservationInfo)object;
+ DuccWorkReservation j1 = i1.getReservation();
+ DuccWorkReservation j2 = i2.getReservation();
+ String s1 = j1.getDuccId().toString();
+ String s2 = j2.getDuccId().toString();
+ retVal = s1.equals(s2);
+ }
+ catch(Throwable t) {
+ }
}
return retVal;
}
Modified:
uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/registry/sort/SortableService.java
URL:
http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/registry/sort/SortableService.java?rev=1750198&r1=1750197&r2=1750198&view=diff
==============================================================================
---
uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/registry/sort/SortableService.java
(original)
+++
uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/registry/sort/SortableService.java
Sat Jun 25 10:57:37 2016
@@ -86,20 +86,12 @@ public class SortableService extends Ser
boolean a1 = this.isAlert();
boolean a2 = that.isAlert();
if(a2) {
- if(a1) {
- retVal = 0;
- }
- else {
+ if(!a1) {
retVal = 1;
}
}
else if(a1) {
- if(a2) {
- retVal = 0;
- }
- else {
- retVal = 0-1;
- }
+ retVal = 0-1;
}
return retVal;
}
Modified:
uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccAbstractHandler.java
URL:
http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccAbstractHandler.java?rev=1750198&r1=1750197&r2=1750198&view=diff
==============================================================================
---
uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccAbstractHandler.java
(original)
+++
uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccAbstractHandler.java
Sat Jun 25 10:57:37 2016
@@ -336,7 +336,7 @@ public abstract class DuccAbstractHandle
if(users != null) {
if(user != null) {
if(!users.isEmpty()) {
- if(!user.contains(user)) {
+ if(!users.contains(user)) {
retVal = false;
}
}
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=1750198&r1=1750197&r2=1750198&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
Sat Jun 25 10:57:37 2016
@@ -3117,20 +3117,28 @@ public class DuccHandler extends DuccAbs
try {
memTotal +=
Long.parseLong(machineInfo.getMemTotal());
}
- catch(Exception e) {};
+ catch(Exception e) {
+ duccLogger.trace(methodName, jobid, e);
+ };
try {swapInuse +=
Long.parseLong(machineInfo.getSwapInuse());
}
- catch(Exception e) {};
+ catch(Exception e) {
+ duccLogger.trace(methodName, jobid, e);
+ };
try {swapFree +=
Long.parseLong(machineInfo.getSwapFree());
}
- catch(Exception e) {};
+ catch(Exception e) {
+ duccLogger.trace(methodName, jobid, e);
+ };
try {
List<ProcessInfo> alienPidsList =
machineInfo.getAlienPids();
if(alienPidsList != null) {
alienPids += alienPidsList.size();
}
}
- catch(Exception e) {};
+ catch(Exception e) {
+ duccLogger.trace(methodName, jobid, e);
+ };
}
// pass 2
iterator = sortedMachines.keySet().iterator();
Modified:
uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandlerClassic.java
URL:
http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandlerClassic.java?rev=1750198&r1=1750197&r2=1750198&view=diff
==============================================================================
---
uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandlerClassic.java
(original)
+++
uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandlerClassic.java
Sat Jun 25 10:57:37 2016
@@ -1736,6 +1736,9 @@ public class DuccHandlerClassic extends
// Status
StringBuffer sb = new StringBuffer();
String status = facts.status;
+ if(status == null) {
+ status = "?";
+ }
hover = "title=\""+facts.statusReason+"\"";
if(status.equals("down")) {
sb.append("<span "+hover+"
class=\"health_red\""+">");
Modified:
uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccWebMonitorJob.java
URL:
http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccWebMonitorJob.java?rev=1750198&r1=1750197&r2=1750198&view=diff
==============================================================================
---
uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccWebMonitorJob.java
(original)
+++
uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccWebMonitorJob.java
Sat Jun 25 10:57:37 2016
@@ -85,14 +85,14 @@ public class DuccWebMonitorJob {
gone.remove(duccId);
if(!mMap.containsKey(duccId)) {
MonitorInfo monitorInfo = new MonitorInfo();
- mMap.put(duccId, monitorInfo);
+ mMap.putIfAbsent(duccId, monitorInfo);
duccLogger.info(location, duccId, "monitor
start");
if(!tMap.containsKey(duccId)) {
if(dw.isCancelOnInterrupt()) {
TrackingInfo ti = new
TrackingInfo();
ti.time = expiryMillis;
ti.user =
dw.getStandardInfo().getUser();
- tMap.put(duccId,ti);
+ tMap.putIfAbsent(duccId,ti);
duccLogger.info(location,
duccId, "auto-cancel on");
}
else {
Modified:
uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccWebMonitorManagedReservation.java
URL:
http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccWebMonitorManagedReservation.java?rev=1750198&r1=1750197&r2=1750198&view=diff
==============================================================================
---
uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccWebMonitorManagedReservation.java
(original)
+++
uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccWebMonitorManagedReservation.java
Sat Jun 25 10:57:37 2016
@@ -83,14 +83,14 @@ public class DuccWebMonitorManagedReserv
gone.remove(duccId);
if(!mMap.containsKey(duccId)) {
MonitorInfo monitorInfo = new MonitorInfo();
- mMap.put(duccId, monitorInfo);
+ mMap.putIfAbsent(duccId, monitorInfo);
duccLogger.info(location, duccId, "monitor
start");
if(!tMap.containsKey(duccId)) {
if(dw.isCancelOnInterrupt()) {
TrackingInfo ti = new
TrackingInfo();
ti.time = expiryMillis;
ti.user =
dw.getStandardInfo().getUser();
- tMap.put(duccId,ti);
+ tMap.putIfAbsent(duccId,ti);
duccLogger.info(location,
duccId, "auto-cancel on");
}
else {
Modified:
uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccWebMonitorReservation.java
URL:
http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccWebMonitorReservation.java?rev=1750198&r1=1750197&r2=1750198&view=diff
==============================================================================
---
uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccWebMonitorReservation.java
(original)
+++
uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccWebMonitorReservation.java
Sat Jun 25 10:57:37 2016
@@ -85,14 +85,14 @@ public class DuccWebMonitorReservation {
gone.remove(duccId);
if(!mMap.containsKey(duccId)) {
MonitorInfo monitorInfo = new MonitorInfo();
- mMap.put(duccId, monitorInfo);
+ mMap.putIfAbsent(duccId, monitorInfo);
duccLogger.info(location, duccId, "monitor
start");
if(!tMap.containsKey(duccId)) {
if(dw.isCancelOnInterrupt()) {
TrackingInfo ti = new
TrackingInfo();
ti.time = expiryMillis;
ti.user =
dw.getStandardInfo().getUser();
- tMap.put(duccId,ti);
+ tMap.putIfAbsent(duccId,ti);
duccLogger.info(location,
duccId, "auto-cancel on");
}
else {
Modified:
uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/sort/JobDetailsProcesses.java
URL:
http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/sort/JobDetailsProcesses.java?rev=1750198&r1=1750197&r2=1750198&view=diff
==============================================================================
---
uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/sort/JobDetailsProcesses.java
(original)
+++
uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/sort/JobDetailsProcesses.java
Sat Jun 25 10:57:37 2016
@@ -212,16 +212,18 @@ public class JobDetailsProcesses impleme
@Override
public boolean equals(Object object) {
boolean retVal = false;
- try {
- JobDetailsProcesses j1 = this;
- JobDetailsProcesses j2 = (JobDetailsProcesses)object;
- IDuccProcess p1 = j1.getProcess();
- IDuccProcess p2 = j2.getProcess();
- String s1 = p1.getDuccId().toString();
- String s2 = p2.getDuccId().toString();
- retVal = s1.equals(s2);
- }
- catch(Throwable t) {
+ if(object != null) {
+ try {
+ JobDetailsProcesses j1 = this;
+ JobDetailsProcesses j2 =
(JobDetailsProcesses)object;
+ IDuccProcess p1 = j1.getProcess();
+ IDuccProcess p2 = j2.getProcess();
+ String s1 = p1.getDuccId().toString();
+ String s2 = p2.getDuccId().toString();
+ retVal = s1.equals(s2);
+ }
+ catch(Throwable t) {
+ }
}
return retVal;
}
Modified:
uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/types/Ip.java
URL:
http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/types/Ip.java?rev=1750198&r1=1750197&r2=1750198&view=diff
==============================================================================
---
uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/types/Ip.java
(original)
+++
uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/types/Ip.java
Sat Jun 25 10:57:37 2016
@@ -56,4 +56,12 @@ public class Ip implements Comparable<Ip
}
return retVal;
}
+
+ // @return use ip as hashCode
+
+ @Override
+ public int hashCode()
+ {
+ return ip.hashCode();
+ }
}
