Repository: openmeetings Updated Branches: refs/heads/master e25958529 -> 8d54fae1a
no jira: couple NPEs are fixed Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/8d54fae1 Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/8d54fae1 Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/8d54fae1 Branch: refs/heads/master Commit: 8d54fae1aa33f2ae320da2a9d076d45794c223e1 Parents: e259585 Author: Maxim Solodovnik <[email protected]> Authored: Fri Jun 23 13:44:31 2017 +0700 Committer: Maxim Solodovnik <[email protected]> Committed: Fri Jun 23 13:44:31 2017 +0700 ---------------------------------------------------------------------- .../apache/openmeetings/core/converter/BaseConverter.java | 2 +- .../java/org/apache/openmeetings/util/OmFileHelper.java | 7 +++++-- .../openmeetings/web/util/FileItemResourceReference.java | 2 ++ .../web/util/ProfileImageResourceReference.java | 8 ++++++-- .../apache/openmeetings/web/util/UserChoiceProvider.java | 10 ++++++---- 5 files changed, 20 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/openmeetings/blob/8d54fae1/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/BaseConverter.java ---------------------------------------------------------------------- diff --git a/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/BaseConverter.java b/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/BaseConverter.java index 4d66de3..a8dffe2 100644 --- a/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/BaseConverter.java +++ b/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/BaseConverter.java @@ -104,7 +104,7 @@ public abstract class BaseConverter { } protected long diff(Date from, Date to) { - return from.getTime() - to.getTime(); + return from == null || to == null ? 0 : from.getTime() - to.getTime(); } protected double diffSeconds(Date from, Date to) { http://git-wip-us.apache.org/repos/asf/openmeetings/blob/8d54fae1/openmeetings-util/src/main/java/org/apache/openmeetings/util/OmFileHelper.java ---------------------------------------------------------------------- diff --git a/openmeetings-util/src/main/java/org/apache/openmeetings/util/OmFileHelper.java b/openmeetings-util/src/main/java/org/apache/openmeetings/util/OmFileHelper.java index 1078f09..02bfdb1 100644 --- a/openmeetings-util/src/main/java/org/apache/openmeetings/util/OmFileHelper.java +++ b/openmeetings-util/src/main/java/org/apache/openmeetings/util/OmFileHelper.java @@ -137,8 +137,11 @@ public class OmFileHelper { } public static File getUserProfilePicture(Long userId, String uri) { - File img = new File(getUploadProfilesUserDir(userId), uri == null ? "" : uri); - if (!img.exists() || img.isDirectory()) { + File img = null; + if (userId != null) { + img = new File(getUploadProfilesUserDir(userId), uri == null ? "" : uri); + } + if (img == null || !img.exists() || img.isDirectory()) { img = getDefaultProfilePicture(); } return img; http://git-wip-us.apache.org/repos/asf/openmeetings/blob/8d54fae1/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/FileItemResourceReference.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/FileItemResourceReference.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/FileItemResourceReference.java index 7082563..680159d 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/FileItemResourceReference.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/FileItemResourceReference.java @@ -58,6 +58,8 @@ public abstract class FileItemResourceReference<T extends FileItem> extends File r = getFileItem(attr); if (r != null) { file = getFile(r, attr); + } + if (file != null && file.exists()) { ResourceResponse rr = createResourceResponse(attr, file.toPath()); rr.setFileName(getFileName(r)); return rr; http://git-wip-us.apache.org/repos/asf/openmeetings/blob/8d54fae1/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/ProfileImageResourceReference.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/ProfileImageResourceReference.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/ProfileImageResourceReference.java index 8672f84..a5de7c0 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/ProfileImageResourceReference.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/ProfileImageResourceReference.java @@ -85,8 +85,12 @@ public class ProfileImageResourceReference extends ResourceReference { ResourceResponse rr; if (WebSession.get().isSignedIn()) { PageParameters params = attributes.getParameters(); - userId = params.get("id").toOptionalLong(); - uri = getBean(UserDao.class).get(userId).getPictureuri(); + try { + userId = params.get("id").toOptionalLong(); + uri = getBean(UserDao.class).get(userId).getPictureuri(); + } catch (Exception e) { + // no-op, junk filter + } rr = super.newResourceResponse(attributes); rr.disableCaching(); } else { http://git-wip-us.apache.org/repos/asf/openmeetings/blob/8d54fae1/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/UserChoiceProvider.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/UserChoiceProvider.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/UserChoiceProvider.java index 93c3864..b5af755 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/UserChoiceProvider.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/UserChoiceProvider.java @@ -68,10 +68,12 @@ public class UserChoiceProvider extends RestrictiveChoiceProvider<User> { } else { email = value; } - Validatable<String> valEmail = new Validatable<>(email); - RfcCompliantEmailAddressValidator.getInstance().validate(valEmail); - if (valEmail.isValid()) { - u = getBean(UserDao.class).getContact(email, fName, lName, getUserId()); + if (!Strings.isEmpty(email)) { + Validatable<String> valEmail = new Validatable<>(email); + RfcCompliantEmailAddressValidator.getInstance().validate(valEmail); + if (valEmail.isValid()) { + u = getBean(UserDao.class).getContact(email, fName, lName, getUserId()); + } } } return u;
