You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by so...@apache.org on 2017/05/01 06:08:56 UTC
[10/50] [abbrv] openmeetings git commit: [OPENMEETINGS-1595] couple
NPEs are fixed
[OPENMEETINGS-1595] 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/b13eb4c1
Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/b13eb4c1
Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/b13eb4c1
Branch: refs/heads/3.2.x
Commit: b13eb4c1245bf83103cfc0f048b6bd3f122a6252
Parents: daafaa8
Author: Maxim Solodovnik <so...@apache.org>
Authored: Fri Mar 17 05:07:08 2017 +0000
Committer: Maxim Solodovnik <so...@apache.org>
Committed: Fri Mar 17 05:07:08 2017 +0000
----------------------------------------------------------------------
.../db/dao/record/RecordingMetaDataDao.java | 13 ++++++-------
.../org/apache/openmeetings/web/common/MainPanel.java | 8 +++++---
2 files changed, 11 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/b13eb4c1/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/record/RecordingMetaDataDao.java
----------------------------------------------------------------------
diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/record/RecordingMetaDataDao.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/record/RecordingMetaDataDao.java
index 33d8665..d7188ee 100644
--- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/record/RecordingMetaDataDao.java
+++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/record/RecordingMetaDataDao.java
@@ -131,13 +131,12 @@ public class RecordingMetaDataDao {
try {
RecordingMetaData meta = get(metaId);
- meta.setRecordEnd(recordEnd);
-
- log.debug("updateEndDate :: Start Date :" + meta.getRecordStart());
- log.debug("updateEndDate :: End Date :" + meta.getRecordEnd());
-
- update(meta);
-
+ if (meta != null) {
+ meta.setRecordEnd(recordEnd);
+ log.debug("updateEndDate :: Start Date :" + meta.getRecordStart());
+ log.debug("updateEndDate :: End Date :" + meta.getRecordEnd());
+ update(meta);
+ }
return metaId;
} catch (Exception ex2) {
log.error("[updateEndDate]: ", ex2);
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/b13eb4c1/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/MainPanel.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/MainPanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/MainPanel.java
index 7d7332d..3055c86 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/MainPanel.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/MainPanel.java
@@ -261,9 +261,11 @@ public class MainPanel extends Panel {
private void closeHandler(AbstractClientMessage msg) {
//no chance to stop pingTimer here :(
- log.debug("WebSocketBehavior::closeHandler [uid: {}, session: {}, key: {}]", client.getUid(), msg.getSessionId(), msg.getKey());
- exit(client);
- client = null;
+ if (client != null) {
+ log.debug("WebSocketBehavior::closeHandler [uid: {}, session: {}, key: {}]", client.getUid(), msg.getSessionId(), msg.getKey());
+ exit(client);
+ client = null;
+ }
}
});
add(new OmAjaxClientInfoBehavior());