Repository: openmeetings Updated Branches: refs/heads/master a0f176575 -> 26c244524
[OPENMEETINGS-1714] more issues are fixed Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/26c24452 Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/26c24452 Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/26c24452 Branch: refs/heads/master Commit: 26c244524d94e6b62e8775ebc4480deef637a63d Parents: a0f1765 Author: Maxim Solodovnik <[email protected]> Authored: Sat Sep 30 22:02:58 2017 +0700 Committer: Maxim Solodovnik <[email protected]> Committed: Sat Sep 30 22:02:58 2017 +0700 ---------------------------------------------------------------------- .../core/documents/LibraryChartLoader.java | 19 ++----- .../openmeetings/db/dao/file/FileItemDao.java | 16 ------ .../db/dao/record/RecordingDao.java | 46 ++--------------- .../db/dao/record/RecordingMetaDataDao.java | 14 ++--- .../db/dao/user/PrivateMessageFolderDao.java | 15 ------ .../db/dao/user/UserContactDao.java | 54 +++----------------- .../db/entity/record/Recording.java | 2 - .../db/entity/user/UserContact.java | 9 ---- .../screenshare/RTMPSScreenShare.java | 1 - .../screenshare/RTMPScreenShare.java | 1 - .../screenshare/RTMPTSScreenShare.java | 1 - .../screenshare/RTMPTScreenShare.java | 1 - .../openmeetings/screenshare/gui/BlankArea.java | 6 +-- .../web/app/OmAuthenticationStrategy.java | 2 +- .../web/common/UploadableImagePanel.java | 3 +- .../openmeetings/web/pages/auth/SignInPage.java | 2 +- .../web/room/sidebar/UploadDialog.java | 2 +- 17 files changed, 28 insertions(+), 166 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/openmeetings/blob/26c24452/openmeetings-core/src/main/java/org/apache/openmeetings/core/documents/LibraryChartLoader.java ---------------------------------------------------------------------- diff --git a/openmeetings-core/src/main/java/org/apache/openmeetings/core/documents/LibraryChartLoader.java b/openmeetings-core/src/main/java/org/apache/openmeetings/core/documents/LibraryChartLoader.java index 0cbde69..4244b1b 100644 --- a/openmeetings-core/src/main/java/org/apache/openmeetings/core/documents/LibraryChartLoader.java +++ b/openmeetings-core/src/main/java/org/apache/openmeetings/core/documents/LibraryChartLoader.java @@ -36,23 +36,12 @@ import com.thoughtworks.xstream.io.xml.XppDriver; public class LibraryChartLoader { private static final Logger log = Red5LoggerFactory.getLogger(LibraryChartLoader.class, getWebAppRootKey()); - private static final String CHART_EXT = ".xchart"; - private static LibraryChartLoader instance; - - private LibraryChartLoader() { - } - - public static synchronized LibraryChartLoader getInstance() { - if (instance == null) { - instance = new LibraryChartLoader(); - } - return instance; - } + private LibraryChartLoader() {} @SuppressWarnings("rawtypes") - public ArrayList loadChart(File dir, String fileName) { + public static ArrayList loadChart(File dir, String fileName) { try { File file = new File(dir, fileName + CHART_EXT); @@ -70,8 +59,6 @@ public class LibraryChartLoader { } catch (Exception err) { log.error("Unexpected error while loading chart", err); } - - return null; + return new ArrayList<>(); } - } http://git-wip-us.apache.org/repos/asf/openmeetings/blob/26c24452/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/file/FileItemDao.java ---------------------------------------------------------------------- diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/file/FileItemDao.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/file/FileItemDao.java index 14817f9..0441375 100644 --- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/file/FileItemDao.java +++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/file/FileItemDao.java @@ -76,22 +76,6 @@ public class FileItemDao extends BaseFileItemDao { return null; } - public List<FileItem> getByRoomAndOwner(Long roomId, Long ownerId) { - log.debug(".getByRoomAndOwner() started"); - try { - TypedQuery<FileItem> query = em.createNamedQuery("getFilesByRoomAndOwner", FileItem.class); - query.setParameter("roomId", roomId); - query.setParameter("ownerId", ownerId); - - List<FileItem> fileExplorerList = query.getResultList(); - - return fileExplorerList; - } catch (Exception ex2) { - log.error("[getByRoomAndOwner]: ", ex2); - } - return null; - } - public List<FileItem> getByRoom(Long roomId) { log.debug("getByRoom roomId :: " + roomId); return em.createNamedQuery("getFilesByRoom", FileItem.class).setParameter("roomId", roomId).getResultList(); http://git-wip-us.apache.org/repos/asf/openmeetings/blob/26c24452/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/record/RecordingDao.java ---------------------------------------------------------------------- diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/record/RecordingDao.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/record/RecordingDao.java index bdecf0b..25b3f3a 100644 --- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/record/RecordingDao.java +++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/record/RecordingDao.java @@ -24,6 +24,7 @@ import static org.apache.openmeetings.util.OpenmeetingsVariables.getWebAppRootKe import java.time.Duration; import java.time.Instant; +import java.util.ArrayList; import java.util.Date; import java.util.List; @@ -81,38 +82,10 @@ public class RecordingDao extends BaseFileItemDao { } catch (Exception ex2) { log.error("[getByExternalId]: ", ex2); } - return null; - } - - public List<Recording> getByExternalTypeAndCreator(String externalType, Long insertedBy) { - try { - - log.debug("getByExternalType :externalType: " + externalType); - - TypedQuery<Recording> query = em.createNamedQuery("getRecordingsByExternalTypeAndOwner", Recording.class); - query.setParameter("externalType", externalType); - query.setParameter("insertedBy", insertedBy); - - List<Recording> recordingList = query.getResultList(); - - log.debug("getByExternalType :: " + recordingList.size()); - - return recordingList; - } catch (Exception ex2) { - log.error("[getByExternalType]: ", ex2); - } - return null; + return new ArrayList<>(); } - public List<Recording> get() { - try { - TypedQuery<Recording> query = em.createNamedQuery("getRecordingsAll", Recording.class); - - return query.getResultList(); - } catch (Exception ex2) { - log.error("[get]: ", ex2); - } - return null; + return em.createNamedQuery("getRecordingsAll", Recording.class).getResultList(); } public List<Recording> getByExternalType(String externalType) { @@ -137,17 +110,8 @@ public class RecordingDao extends BaseFileItemDao { } public List<Recording> getByRoomId(Long roomId) { - try { - TypedQuery<Recording> query = em.createNamedQuery("getRecordingsByRoom", Recording.class); - query.setParameter("roomId", roomId); - - List<Recording> recordingList = query.getResultList(); - - return recordingList; - } catch (Exception ex2) { - log.error("[getByRoomId]: ", ex2); - } - return null; + return em.createNamedQuery("getRecordingsByRoom", Recording.class) + .setParameter("roomId", roomId).getResultList(); } public List<Recording> getExpiring(Long groupId, int reminderDays, boolean notified) { http://git-wip-us.apache.org/repos/asf/openmeetings/blob/26c24452/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 84d6bf7..55d332c 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 @@ -55,16 +55,10 @@ public class RecordingMetaDataDao { } public List<RecordingMetaData> getAudioMetaDataByRecording(Long recordingId) { - try { - TypedQuery<RecordingMetaData> query = em.createNamedQuery("getAudioMetaByRecording", RecordingMetaData.class); - query.setParameter("recordingId", recordingId); - query.setParameter("none", Status.NONE); - - return query.getResultList(); - } catch (Exception ex2) { - log.error("[getAudioMetaDataByRecording]: ", ex2); - } - return null; + return em.createNamedQuery("getAudioMetaByRecording", RecordingMetaData.class) + .setParameter("recordingId", recordingId) + .setParameter("none", Status.NONE) + .getResultList(); } public RecordingMetaData getScreenMetaDataByRecording(Long recordingId) { http://git-wip-us.apache.org/repos/asf/openmeetings/blob/26c24452/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/PrivateMessageFolderDao.java ---------------------------------------------------------------------- diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/PrivateMessageFolderDao.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/PrivateMessageFolderDao.java index 209753f..27d5662 100644 --- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/PrivateMessageFolderDao.java +++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/PrivateMessageFolderDao.java @@ -25,7 +25,6 @@ import java.util.List; import javax.persistence.EntityManager; import javax.persistence.PersistenceContext; -import javax.persistence.TypedQuery; import org.apache.openmeetings.db.dao.IDataProviderDao; import org.apache.openmeetings.db.entity.user.PrivateMessageFolder; @@ -98,20 +97,6 @@ public class PrivateMessageFolderDao implements IDataProviderDao<PrivateMessageF return folder; } - public List<PrivateMessageFolder> getPrivateMessageFolderByUserId(Long userId) { - try { - String hql = "select c from PrivateMessageFolder c where c.userId = :userId "; - - TypedQuery<PrivateMessageFolder> query = em.createQuery(hql, PrivateMessageFolder.class); - query.setParameter("userId", userId); - - return query.getResultList(); - } catch (Exception e) { - log.error("[getPrivateMessageFolderByUserId]",e); - } - return null; - } - @Override public void delete(PrivateMessageFolder folder, Long userId) { folder = em.find(PrivateMessageFolder.class, folder.getId()); http://git-wip-us.apache.org/repos/asf/openmeetings/blob/26c24452/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/UserContactDao.java ---------------------------------------------------------------------- diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/UserContactDao.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/UserContactDao.java index cf293c1..a76fe5d 100644 --- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/UserContactDao.java +++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/UserContactDao.java @@ -104,55 +104,17 @@ public class UserContactDao { } public List<UserContact> getContactsByUserAndStatus(Long ownerId, boolean pending) { - try { - TypedQuery<UserContact> query = em.createNamedQuery("getContactsByUserAndStatus", UserContact.class); - query.setParameter("ownerId", ownerId); - query.setParameter("pending", pending); - return query.getResultList(); - } catch (Exception e) { - log.error("[getContactsByUserAndStatus]",e); - } - return null; - } - - public UserContact getUserContactByShareCalendar(Long contactId, - Boolean shareCalendar, Long userId) { - try { - TypedQuery<UserContact> query = em.createNamedQuery("getUserContactByShareCalendar", - UserContact.class); - query.setParameter("contactId", contactId); - query.setParameter("userId", userId); - query.setParameter("shareCalendar", shareCalendar); - List<UserContact> ll = query.getResultList(); - return ll.isEmpty() ? null : ll.get(0); - } catch (Exception e) { - log.error("[getUserContactByShareCalendar]", e); - } - return null; - } - - public List<UserContact> getContactsByShareCalendar(Long contactId, Boolean shareCalendar) { - try { - TypedQuery<UserContact> query = em.createNamedQuery("getContactsByShareCalendar", UserContact.class); - query.setParameter("contactId", contactId); - query.setParameter("shareCalendar", shareCalendar); - return query.getResultList(); - } catch (Exception e) { - log.error("[getContactsByShareCalendar]",e); - } - return null; + return em.createNamedQuery("getContactsByUserAndStatus", UserContact.class) + .setParameter("ownerId", ownerId) + .setParameter("pending", pending) + .getResultList(); } public List<UserContact> getContactRequestsByUserAndStatus(Long userId, boolean pending) { - try { - TypedQuery<UserContact> query = em.createNamedQuery("getContactRequestsByUserAndStatus", UserContact.class); - query.setParameter("userId", userId); - query.setParameter("pending", pending); - return query.getResultList(); - } catch (Exception e) { - log.error("[getContactRequestsByUserAndStatus]",e); - } - return null; + return em.createNamedQuery("getContactRequestsByUserAndStatus", UserContact.class) + .setParameter("userId", userId) + .setParameter("pending", pending) + .getResultList(); } public UserContact get(Long id) { http://git-wip-us.apache.org/repos/asf/openmeetings/blob/26c24452/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/record/Recording.java ---------------------------------------------------------------------- diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/record/Recording.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/record/Recording.java index 06ba134..5564103 100644 --- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/record/Recording.java +++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/record/Recording.java @@ -75,8 +75,6 @@ import org.simpleframework.xml.Root; + "ORDER BY f.type ASC, f.inserted") , @NamedQuery(name = "resetRecordingProcessingStatus", query = "UPDATE Recording f SET f.status = :error WHERE f.status IN (:recording, :converting)") , @NamedQuery(name = "getRecordingsAll", query = "SELECT c FROM Recording c LEFT JOIN FETCH c.metaData ORDER BY c.id") - , @NamedQuery(name = "getRecordingsByExternalTypeAndOwner", query = "SELECT c FROM Recording c, Room r WHERE c.roomId = r.id " - + "AND r.externalType LIKE :externalType AND c.insertedBy LIKE :insertedBy AND c.deleted = false") , @NamedQuery(name = "getRecordingsByRoom", query = "SELECT c FROM Recording c WHERE c.deleted = false AND c.roomId = :roomId " + "ORDER BY c.type ASC, c.inserted") , @NamedQuery(name = "getRecordingsByParent", query = "SELECT f FROM Recording f WHERE f.deleted = false AND f.parentId = :parentId " http://git-wip-us.apache.org/repos/asf/openmeetings/blob/26c24452/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/UserContact.java ---------------------------------------------------------------------- diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/UserContact.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/UserContact.java index da9d05b..60cdaf4 100644 --- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/UserContact.java +++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/UserContact.java @@ -46,15 +46,6 @@ import org.simpleframework.xml.Root; "where c.owner.id = :ownerId " + "AND c.pending = :pending " + "AND c.contact.deleted = false"), - @NamedQuery(name = "getUserContactByShareCalendar", query = "select c from UserContact c " - + "where c.contact.id = :userId " - + "AND c.owner.id = :contactId " - + "AND c.shareCalendar = :shareCalendar " - + "AND c.contact.deleted = false"), - @NamedQuery(name = "getContactsByShareCalendar", query = "select c from UserContact c " + - "where c.contact.id = :contactId " + - "AND c.shareCalendar = :shareCalendar " + - "AND c.contact.deleted = false"), @NamedQuery(name = "getContactRequestsByUserAndStatus", query = "select c from UserContact c " + "where c.contact.id = :userId " + "AND c.pending = :pending " + http://git-wip-us.apache.org/repos/asf/openmeetings/blob/26c24452/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/RTMPSScreenShare.java ---------------------------------------------------------------------- diff --git a/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/RTMPSScreenShare.java b/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/RTMPSScreenShare.java index 88ede5d..3458821 100644 --- a/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/RTMPSScreenShare.java +++ b/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/RTMPSScreenShare.java @@ -62,7 +62,6 @@ public class RTMPSScreenShare extends RTMPSClient implements IScreenShare { public void handleException(Throwable throwable) { Throwable cause = throwable.getCause(); log.error("{}", new Object[] { cause }); - System.out.println(cause); core.handleException(cause); } } http://git-wip-us.apache.org/repos/asf/openmeetings/blob/26c24452/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/RTMPScreenShare.java ---------------------------------------------------------------------- diff --git a/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/RTMPScreenShare.java b/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/RTMPScreenShare.java index 18241e3..d28ea9c 100644 --- a/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/RTMPScreenShare.java +++ b/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/RTMPScreenShare.java @@ -62,7 +62,6 @@ public class RTMPScreenShare extends RTMPClient implements IScreenShare { public void handleException(Throwable throwable) { Throwable cause = throwable.getCause(); log.error("{}", new Object[] { cause }); - System.out.println(cause); core.handleException(cause); } } http://git-wip-us.apache.org/repos/asf/openmeetings/blob/26c24452/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/RTMPTSScreenShare.java ---------------------------------------------------------------------- diff --git a/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/RTMPTSScreenShare.java b/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/RTMPTSScreenShare.java index d688cd0..6301e48 100644 --- a/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/RTMPTSScreenShare.java +++ b/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/RTMPTSScreenShare.java @@ -62,7 +62,6 @@ public class RTMPTSScreenShare extends RTMPTSClient implements IScreenShare { public void handleException(Throwable throwable) { Throwable cause = throwable.getCause(); log.error("{}", new Object[] { cause }); - System.out.println(cause); core.handleException(cause); } } http://git-wip-us.apache.org/repos/asf/openmeetings/blob/26c24452/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/RTMPTScreenShare.java ---------------------------------------------------------------------- diff --git a/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/RTMPTScreenShare.java b/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/RTMPTScreenShare.java index 6fd5051..4a3ccca 100644 --- a/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/RTMPTScreenShare.java +++ b/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/RTMPTScreenShare.java @@ -62,7 +62,6 @@ public class RTMPTScreenShare extends RTMPTClient implements IScreenShare { public void handleException(Throwable throwable) { Throwable cause = throwable.getCause(); log.error("{}", new Object[] { cause }); - System.out.println(cause); core.handleException(cause); } } http://git-wip-us.apache.org/repos/asf/openmeetings/blob/26c24452/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/gui/BlankArea.java ---------------------------------------------------------------------- diff --git a/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/gui/BlankArea.java b/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/gui/BlankArea.java index 1616180..d083f24 100644 --- a/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/gui/BlankArea.java +++ b/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/gui/BlankArea.java @@ -26,7 +26,7 @@ import javax.swing.SwingConstants; public class BlankArea extends MouseListenerable { private static final long serialVersionUID = 1L; - private Dimension minSize = new Dimension(100, 50); + private static final Dimension MIN_SIZE = new Dimension(100, 50); public BlankArea(Color color) { setBackground(color); @@ -36,7 +36,7 @@ public class BlankArea extends MouseListenerable { setHorizontalTextPosition(0); setVerticalTextPosition(0); setBorder(BorderFactory.createLineBorder(Color.black)); - setMinimumSize(minSize); - setPreferredSize(minSize); + setMinimumSize(MIN_SIZE); + setPreferredSize(MIN_SIZE); } } http://git-wip-us.apache.org/repos/asf/openmeetings/blob/26c24452/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/OmAuthenticationStrategy.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/OmAuthenticationStrategy.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/OmAuthenticationStrategy.java index f9048a7..a1b213f 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/OmAuthenticationStrategy.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/OmAuthenticationStrategy.java @@ -57,7 +57,7 @@ public class OmAuthenticationStrategy extends DefaultAuthenticationStrategy { return new String[] { username, password, type, domainId }; } - return null; + return new String[] {}; } public void save(final String username, final String password, final Type type, final Long domainId) { http://git-wip-us.apache.org/repos/asf/openmeetings/blob/26c24452/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/UploadableImagePanel.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/UploadableImagePanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/UploadableImagePanel.java index 78eb481..ad99c18 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/UploadableImagePanel.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/UploadableImagePanel.java @@ -22,6 +22,7 @@ import static org.apache.openmeetings.util.OpenmeetingsVariables.getWebAppRootKe import static org.apache.openmeetings.web.app.Application.getBean; import java.io.File; +import java.util.ArrayList; import java.util.List; import org.apache.openmeetings.db.dao.basic.ConfigurationDao; @@ -46,7 +47,7 @@ public abstract class UploadableImagePanel extends ImagePanel { @Override public List<FileUpload> getObject() { - return null; + return new ArrayList<>(); } }); http://git-wip-us.apache.org/repos/asf/openmeetings/blob/26c24452/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInPage.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInPage.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInPage.java index 1848c35..95c8c9d 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInPage.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInPage.java @@ -216,7 +216,7 @@ public class SignInPage extends BaseInitedPage { @Override public X509Certificate[] getAcceptedIssuers() { - return null; + return new X509Certificate[] {}; } }}; try { http://git-wip-us.apache.org/repos/asf/openmeetings/blob/26c24452/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/UploadDialog.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/UploadDialog.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/UploadDialog.java index 2bc0695..5bf35db 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/UploadDialog.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/UploadDialog.java @@ -120,7 +120,7 @@ public class UploadDialog extends AbstractFormDialog<String> { @Override public List<FileUpload> getObject() { - return null; + return new ArrayList<>(); } })); uploadField.add(AttributeModifier.append("accept", StoredFile.getAcceptAttr()));
