Author: degenaro
Date: Fri Jul 1 09:20:14 2016
New Revision: 1750894
URL: http://svn.apache.org/viewvc?rev=1750894&view=rev
Log:
UIMA-4989 Fix problems found by FindBugs
Modified:
uima/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/jd/files/perf/PerformanceSummaryReader.java
uima/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/utils/DuccSchedulerClasses.java
uima/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/utils/Utils.java
uima/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/utils/id/DuccIdFactory.java
Modified:
uima/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/jd/files/perf/PerformanceSummaryReader.java
URL:
http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/jd/files/perf/PerformanceSummaryReader.java?rev=1750894&r1=1750893&r2=1750894&view=diff
==============================================================================
---
uima/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/jd/files/perf/PerformanceSummaryReader.java
(original)
+++
uima/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/jd/files/perf/PerformanceSummaryReader.java
Fri Jul 1 09:20:14 2016
@@ -68,15 +68,17 @@ public class PerformanceSummaryReader ex
catch(Exception e) {
}
}
- Integer casCount = data.getCasCount();
- map.putCasCount(casCount);
- ConcurrentSkipListMap<String, JobPerformanceSummary> gzMap =
data.getMap();
- Set<Entry<String, JobPerformanceSummary>> entries =
gzMap.entrySet();
- for(Entry<String, JobPerformanceSummary> entry : entries) {
- String key = entry.getKey();
- IJobPerformanceSummary jps = entry.getValue();
- PerformanceMetricsSummaryItem value = new
PerformanceMetricsSummaryItem(jps.getName(),jps.getUniqueName(),jps.getAnalysisTime(),jps.getNumProcessed(),jps.getAnalysisTimeMin(),jps.getAnalysisTimeMax());
- map.putItem(key, value);
+ if(data != null) {
+ Integer casCount = data.getCasCount();
+ map.putCasCount(casCount);
+ ConcurrentSkipListMap<String, JobPerformanceSummary>
gzMap = data.getMap();
+ Set<Entry<String, JobPerformanceSummary>> entries =
gzMap.entrySet();
+ for(Entry<String, JobPerformanceSummary> entry :
entries) {
+ String key = entry.getKey();
+ IJobPerformanceSummary jps = entry.getValue();
+ PerformanceMetricsSummaryItem value = new
PerformanceMetricsSummaryItem(jps.getName(),jps.getUniqueName(),jps.getAnalysisTime(),jps.getNumProcessed(),jps.getAnalysisTimeMin(),jps.getAnalysisTimeMax());
+ map.putItem(key, value);
+ }
}
return map;
}
Modified:
uima/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/utils/DuccSchedulerClasses.java
URL:
http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/utils/DuccSchedulerClasses.java?rev=1750894&r1=1750893&r2=1750894&view=diff
==============================================================================
---
uima/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/utils/DuccSchedulerClasses.java
(original)
+++
uima/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/utils/DuccSchedulerClasses.java
Fri Jul 1 09:20:14 2016
@@ -39,14 +39,11 @@ public class DuccSchedulerClasses {
private String fileName = null;
- public static DuccSchedulerClasses getInstance() {
- // Use double check locking for safety
- if (instance == null) {
- synchronized(DuccSchedulerClasses.class){
- if (instance == null) {
- instance = new DuccSchedulerClasses();
- }
- }
+ public static DuccSchedulerClasses getInstance() {
+ synchronized(DuccSchedulerClasses.class){
+ if (instance == null) {
+ instance = new DuccSchedulerClasses();
+ }
}
return instance;
}
Modified:
uima/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/utils/Utils.java
URL:
http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/utils/Utils.java?rev=1750894&r1=1750893&r2=1750894&view=diff
==============================================================================
---
uima/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/utils/Utils.java
(original)
+++
uima/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/utils/Utils.java
Fri Jul 1 09:20:14 2016
@@ -176,7 +176,9 @@ public class Utils {
throw e;
} finally {
// Close the input stream
- in.close();
+ if(in != null) {
+ in.close();
+ }
}
}
return nodeList; // empty list
Modified:
uima/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/utils/id/DuccIdFactory.java
URL:
http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/utils/id/DuccIdFactory.java?rev=1750894&r1=1750893&r2=1750894&view=diff
==============================================================================
---
uima/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/utils/id/DuccIdFactory.java
(original)
+++
uima/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/utils/id/DuccIdFactory.java
Fri Jul 1 09:20:14 2016
@@ -18,11 +18,13 @@
*/
package org.apache.uima.ducc.common.utils.id;
+import java.util.concurrent.atomic.AtomicLong;
+
import org.apache.uima.ducc.common.persistence.IPropertiesFileManager;
public class DuccIdFactory implements IDuccIdFactory {
- private volatile long seqno = -1;
+ private AtomicLong seqno = new AtomicLong(-1);
private IPropertiesFileManager propertiesFileManager = null;
private String propertiesFileKey = null;
@@ -36,7 +38,7 @@ public class DuccIdFactory implements ID
}
public DuccIdFactory(long seed) {
- seqno = seed-1;
+ seqno.set(seed-1);
}
/**
@@ -45,19 +47,19 @@ public class DuccIdFactory implements ID
* recovered IDs.
*/
public DuccId next(long s) {
- seqno = Math.max(s, seqno);
+ seqno.set(Math.max(s, seqno.get()));
return new DuccId(s);
}
public DuccId next() {
synchronized(this) {
if(propertiesFileManager != null) {
- seqno =
propertiesFileManager.increment(propertiesFileKey);
+
seqno.set(propertiesFileManager.increment(propertiesFileKey));
}
else {
- seqno++;
+ seqno.incrementAndGet();
}
- return new DuccId(seqno);
+ return new DuccId(seqno.get());
}
}
}
