You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by sc...@apache.org on 2014/04/02 19:14:35 UTC

svn commit: r1584095 - /uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/impl/ConfigurationManager_impl.java

Author: schor
Date: Wed Apr  2 17:14:35 2014
New Revision: 1584095

URL: http://svn.apache.org/r1584095
Log:
no Jira - add one comment, and remove one findbugs issue

Modified:
    uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/impl/ConfigurationManager_impl.java

Modified: uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/impl/ConfigurationManager_impl.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/impl/ConfigurationManager_impl.java?rev=1584095&r1=1584094&r2=1584095&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/impl/ConfigurationManager_impl.java (original)
+++ uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/impl/ConfigurationManager_impl.java Wed Apr  2 17:14:35 2014
@@ -47,6 +47,8 @@ public class ConfigurationManager_impl e
   /**
    * Map containing configuration parameter values and links for parameter values shared by all
    * sessions.
+   * 
+   * Can't (currently) be a concurrentHashMap because it stores nulls
    */
   private Map<String, Object> mSharedParamMap = Collections.synchronizedMap(new HashMap<String, Object>());
 
@@ -96,7 +98,7 @@ public class ConfigurationManager_impl e
             while (getLink(linkedTo) != null) {
               linkedTo = getLink(linkedTo);
             }
-            if (linkedTo != qname && lookup(linkedTo) != null) {
+            if ((!linkedTo.equals(qname)) && lookup(linkedTo) != null) {
               realValue = lookup(linkedTo);
               from = "(overridden from " + linkedTo + ")";
             }