svn commit: r1624248 - in /openmeetings: branches/3.0.x/src/db/java/org/apache/openmeetings/db/dao/user/SalutationDao.java trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/SalutationDao.java

[solomax]

Author: solomax
Date: Thu Sep 11 10:12:18 2014
New Revision: 1624248

URL: http://svn.apache.org/r1624248
Log:
[OPENMEETINGS-1084] NPE fixed

Modified:
    
openmeetings/branches/3.0.x/src/db/java/org/apache/openmeetings/db/dao/user/SalutationDao.java
    
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/SalutationDao.java

Modified: 
openmeetings/branches/3.0.x/src/db/java/org/apache/openmeetings/db/dao/user/SalutationDao.java
URL: 
http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/db/java/org/apache/openmeetings/db/dao/user/SalutationDao.java?rev=1624248&r1=1624247&r2=1624248&view=diff
==============================================================================
--- 
openmeetings/branches/3.0.x/src/db/java/org/apache/openmeetings/db/dao/user/SalutationDao.java
 (original)
+++ 
openmeetings/branches/3.0.x/src/db/java/org/apache/openmeetings/db/dao/user/SalutationDao.java
 Thu Sep 11 10:12:18 2014
@@ -79,13 +79,13 @@ public class SalutationDao {
         * @param language_id
         * @return
         */
-       public Salutation get(long id, long language_id) {
+       public Salutation get(Long id, long language_id) {
                List<Salutation> ll = em.createNamedQuery("getSalutationById", 
Salutation.class)
                                .setParameter("id", id).getResultList();
                for (Salutation ti : ll) {
                        ti.setLabel(fieldLangValDao.get(ti.getFieldvalues_id(), 
language_id));
                }
-               return ll.get(0);
+               return ll.isEmpty() ? null : ll.get(0);
        }
        
        /**

Modified: 
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/SalutationDao.java
URL: 
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/SalutationDao.java?rev=1624248&r1=1624247&r2=1624248&view=diff
==============================================================================
--- 
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/SalutationDao.java
 (original)
+++ 
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/SalutationDao.java
 Thu Sep 11 10:12:18 2014
@@ -79,13 +79,13 @@ public class SalutationDao {
         * @param language_id
         * @return
         */
-       public Salutation get(long id, long language_id) {
+       public Salutation get(Long id, long language_id) {
                List<Salutation> ll = em.createNamedQuery("getSalutationById", 
Salutation.class)
                                .setParameter("id", id).getResultList();
                for (Salutation ti : ll) {
                        ti.setLabel(fieldLangValDao.get(ti.getFieldvalues_id(), 
language_id));
                }
-               return ll.get(0);
+               return ll.isEmpty() ? null : ll.get(0);
        }
        
        /**