svn commit: r1755388 - in /openmeetings/application: branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/label/ branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/label/ trunk/openmeetings-db/src/main/ja...

[solomax]

Author: solomax
Date: Sat Aug  6 06:50:11 2016
New Revision: 1755388

URL: http://svn.apache.org/viewvc?rev=1755388&view=rev
Log:
[OPENMEETINGS-1444] Language editor is fixed

Modified:
    
openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/label/LabelDao.java
    
openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/label/LabelDao.java
    
openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/label/LabelDao.java

Modified: 
openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/label/LabelDao.java
URL: 
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/label/LabelDao.java?rev=1755388&r1=1755387&r2=1755388&view=diff
==============================================================================
--- 
openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/label/LabelDao.java
 (original)
+++ 
openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/label/LabelDao.java
 Sat Aug  6 06:50:11 2016
@@ -253,12 +253,13 @@ public class LabelDao implements IDataPr
        }
        
        private static List<StringLabel> getLabels(Locale l, final String 
search) {
-               List<StringLabel> result = null;
-               if (labelCache.containsKey(l)) {
-                       result = labelCache.get(l);
-               } else {
-                       result = labelCache.putIfAbsent(l, getLabels(l));
+               if (!labelCache.containsKey(l)) {
+                       List<StringLabel> ll = getLabels(l);
+                       if (ll != null) {
+                               labelCache.putIfAbsent(l, ll);
+                       }
                }
+               List<StringLabel> result = labelCache.containsKey(l) ? 
labelCache.get(l) : new ArrayList<StringLabel>();
                if (!Strings.isEmpty(search)) {
                        CollectionUtils.filter(result, new 
Predicate<StringLabel>() {
                                @Override

Modified: 
openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/label/LabelDao.java
URL: 
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/label/LabelDao.java?rev=1755388&r1=1755387&r2=1755388&view=diff
==============================================================================
--- 
openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/label/LabelDao.java
 (original)
+++ 
openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/label/LabelDao.java
 Sat Aug  6 06:50:11 2016
@@ -253,12 +253,13 @@ public class LabelDao implements IDataPr
        }
        
        private static List<StringLabel> getLabels(Locale l, final String 
search) {
-               List<StringLabel> result = null;
-               if (labelCache.containsKey(l)) {
-                       result = labelCache.get(l);
-               } else {
-                       result = labelCache.putIfAbsent(l, getLabels(l));
+               if (!labelCache.containsKey(l)) {
+                       List<StringLabel> ll = getLabels(l);
+                       if (ll != null) {
+                               labelCache.putIfAbsent(l, ll);
+                       }
                }
+               List<StringLabel> result = labelCache.containsKey(l) ? 
labelCache.get(l) : new ArrayList<StringLabel>();
                if (!Strings.isEmpty(search)) {
                        CollectionUtils.filter(result, new 
Predicate<StringLabel>() {
                                @Override

Modified: 
openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/label/LabelDao.java
URL: 
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/label/LabelDao.java?rev=1755388&r1=1755387&r2=1755388&view=diff
==============================================================================
--- 
openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/label/LabelDao.java
 (original)
+++ 
openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/label/LabelDao.java
 Sat Aug  6 06:50:11 2016
@@ -253,12 +253,13 @@ public class LabelDao implements IDataPr
        }
        
        private static List<StringLabel> getLabels(Locale l, final String 
search) {
-               List<StringLabel> result = null;
-               if (labelCache.containsKey(l)) {
-                       result = labelCache.get(l);
-               } else {
-                       result = labelCache.putIfAbsent(l, getLabels(l));
+               if (!labelCache.containsKey(l)) {
+                       List<StringLabel> ll = getLabels(l);
+                       if (ll != null) {
+                               labelCache.putIfAbsent(l, ll);
+                       }
                }
+               List<StringLabel> result = labelCache.containsKey(l) ? 
labelCache.get(l) : new ArrayList<StringLabel>();
                if (!Strings.isEmpty(search)) {
                        CollectionUtils.filter(result, new 
Predicate<StringLabel>() {
                                @Override