Author: solomax
Date: Fri Mar 17 05:07:08 2017
New Revision: 1787286
URL: http://svn.apache.org/viewvc?rev=1787286&view=rev
Log:
[OPENMEETINGS-1595] couple NPEs are fixed
Modified:
openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/record/RecordingMetaDataDao.java
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/MainPanel.java
openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/record/RecordingMetaDataDao.java
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/MainPanel.java
Modified:
openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/record/RecordingMetaDataDao.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/record/RecordingMetaDataDao.java?rev=1787286&r1=1787285&r2=1787286&view=diff
==============================================================================
---
openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/record/RecordingMetaDataDao.java
(original)
+++
openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/record/RecordingMetaDataDao.java
Fri Mar 17 05:07:08 2017
@@ -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);
Modified:
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/MainPanel.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/MainPanel.java?rev=1787286&r1=1787285&r2=1787286&view=diff
==============================================================================
---
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/MainPanel.java
(original)
+++
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/MainPanel.java
Fri Mar 17 05:07:08 2017
@@ -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());
Modified:
openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/record/RecordingMetaDataDao.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/record/RecordingMetaDataDao.java?rev=1787286&r1=1787285&r2=1787286&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/record/RecordingMetaDataDao.java
(original)
+++
openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/record/RecordingMetaDataDao.java
Fri Mar 17 05:07:08 2017
@@ -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);
Modified:
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/MainPanel.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/MainPanel.java?rev=1787286&r1=1787285&r2=1787286&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/MainPanel.java
(original)
+++
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/MainPanel.java
Fri Mar 17 05:07:08 2017
@@ -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());
