[openmeetings] branch master updated: [OPENMEETINGS-1864] tests should we fixed

[solomax]

This is an automated email from the ASF dual-hosted git repository.

solomax pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/openmeetings.git


The following commit(s) were added to refs/heads/master by this push:
     new 63a3c07  [OPENMEETINGS-1864] tests should we fixed
63a3c07 is described below

commit 63a3c0716db75e0eb09930e1969e687f485f3a1b
Author: Maxim Solodovnik <solomax...@gmail.com>
AuthorDate: Sat Apr 7 10:39:19 2018 +0700

    [OPENMEETINGS-1864] tests should we fixed
---
 .../src/main/java/org/apache/openmeetings/db/dto/user/UserDTO.java    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git 
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/user/UserDTO.java
 
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/user/UserDTO.java
index 97eae54..f8da684 100644
--- 
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/user/UserDTO.java
+++ 
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/user/UserDTO.java
@@ -216,8 +216,8 @@ public class UserDTO implements Serializable {
                        u.address.setEmail(a.optString("email"));
                }
                u.timeZoneId = o.optString("timeZoneId");
-               u.externalId = o.optString("externalId");
-               u.externalType = o.optString("externalType");
+               u.externalId = o.optString("externalId", null);
+               u.externalType = o.optString("externalType", null);
                u.type = optEnum(Type.class, o, "type");
                return u;
        }

-- 
To stop receiving notification emails like this one, please contact
solo...@apache.org.