svn commit: r1750517 - in /uima/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common: jd/files/perf/PerformanceMetricsSummaryMap.java utils/DuccLogger.java

[degenaro]

Author: degenaro
Date: Tue Jun 28 14:18:15 2016
New Revision: 1750517

URL: http://svn.apache.org/viewvc?rev=1750517&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/PerformanceMetricsSummaryMap.java
    
uima/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/utils/DuccLogger.java

Modified: 
uima/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/jd/files/perf/PerformanceMetricsSummaryMap.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/PerformanceMetricsSummaryMap.java?rev=1750517&r1=1750516&r2=1750517&view=diff
==============================================================================
--- 
uima/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/jd/files/perf/PerformanceMetricsSummaryMap.java
 (original)
+++ 
uima/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/jd/files/perf/PerformanceMetricsSummaryMap.java
 Tue Jun 28 14:18:15 2016
@@ -83,12 +83,8 @@ public class PerformanceMetricsSummaryMa
        }
        
        private void addEntry(String key, String displayName) {
-               synchronized(map) {
-                       if(!map.containsKey(key)) {
-                               PerformanceMetricsSummaryItem summaryItem = new 
PerformanceMetricsSummaryItem(displayName,key);
-                               map.put(key, summaryItem);
-                       }
-               }
+               PerformanceMetricsSummaryItem summaryItem = new 
PerformanceMetricsSummaryItem(displayName,key);
+               map.putIfAbsent(key, summaryItem);
        }
        
        /**
@@ -108,7 +104,7 @@ public class PerformanceMetricsSummaryMa
                        String displayName = getDisplayName(item);
                        addEntry(key,displayName);
                        PerformanceMetricsSummaryItem summaryItem = 
map.get(key);
-                       synchronized(map) {
+                       synchronized(this) {
                                long timeBefore = summaryItem.getAnalysisTime();
                                long timeItem   = item.getAnalysisTime();
                                long timeAfter  = 
summaryItem.addAndGetAnalysisTime(item.getAnalysisTime());

Modified: 
uima/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/utils/DuccLogger.java
URL: 
http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/utils/DuccLogger.java?rev=1750517&r1=1750516&r2=1750517&view=diff
==============================================================================
--- 
uima/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/utils/DuccLogger.java
 (original)
+++ 
uima/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/utils/DuccLogger.java
 Tue Jun 28 14:18:15 2016
@@ -58,7 +58,7 @@ public class DuccLogger
 
     private boolean debug = System.getProperty("log4j.debug") != null;    // 
Use the log4j debugging flag
 
-    static protected void initLogger()
+    static synchronized protected void initLogger()
     {
         if ( log_thread == null ) {
             events = new LinkedBlockingQueue<DuccLoggingEvent>();
@@ -569,7 +569,7 @@ public class DuccLogger
     public void shutdown()
     {
         if ( threaded.get() ) {
-            DuccLoggingEvent ev = new DuccLoggingEvent(null, null, null, null, 
null, null, null, 0, null);
+            DuccLoggingEvent ev = new DuccLoggingEvent();
             ev.done = true;
             events.offer(ev);
         }
@@ -588,6 +588,9 @@ public class DuccLogger
         String method;
         String jobid;
         
+        DuccLoggingEvent() {
+        }
+        
         DuccLoggingEvent(Logger logger, String component, Level level, String 
method, DuccId jobid, Object msg, Throwable throwable, long threadId, String 
threadName)
         {
             this.logger = logger;