Author: solomax
Date: Wed Jan 27 11:21:25 2016
New Revision: 1726998
URL: http://svn.apache.org/viewvc?rev=1726998&view=rev
Log:
Issues reported by coverity are fixed
Modified:
openmeetings/application/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/conference/RoomManager.java
openmeetings/application/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/record/BatikMethods.java
openmeetings/application/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/documents/LibraryChartLoader.java
openmeetings/application/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/documents/LibraryDocumentConverter.java
openmeetings/application/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/UserService.java
openmeetings/application/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/WhiteBoardService.java
openmeetings/application/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/red5/ScopeApplicationAdapter.java
openmeetings/application/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/servlet/outputhandler/ExportToImage.java
openmeetings/application/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/session/SessionManager.java
openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/server/ISessionManager.java
openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/IUserManager.java
openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/IUserService.java
openmeetings/application/branches/3.1.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/user/UserManager.java
openmeetings/application/branches/3.1.x/openmeetings-util/src/main/java/org/apache/openmeetings/util/stringhandlers/ChatString.java
openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/conference/RoomManager.java
openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/record/BatikMethods.java
openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/documents/LibraryChartLoader.java
openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/documents/LibraryDocumentConverter.java
openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/UserService.java
openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/WhiteBoardService.java
openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/red5/ScopeApplicationAdapter.java
openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/servlet/outputhandler/ExportToImage.java
openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/session/SessionManager.java
openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/server/ISessionManager.java
openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/IUserManager.java
openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/IUserService.java
openmeetings/application/trunk/openmeetings-service/src/main/java/org/apache/openmeetings/service/user/UserManager.java
Modified:
openmeetings/application/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/conference/RoomManager.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/conference/RoomManager.java?rev=1726998&r1=1726997&r2=1726998&view=diff
==============================================================================
---
openmeetings/application/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/conference/RoomManager.java
(original)
+++
openmeetings/application/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/conference/RoomManager.java
Wed Jan 27 11:21:25 2016
@@ -280,37 +280,15 @@ public class RoomManager {
return null;
}
- public List<Room> getRoomsByIds(List<Integer> roomIds) {
+ public List<Room> getRoomsByIds(List<Long> roomIds) {
try {
- if (roomIds == null || roomIds.size() == 0) {
- return new LinkedList<Room>();
+ if (roomIds != null && !roomIds.isEmpty()) {
+ return roomDao.get(roomIds);
}
-
- String queryString = "SELECT r from Room r " + "WHERE ";
-
- queryString += "(";
-
- int i = 0;
- for (Integer roomId : roomIds) {
- if (i != 0) {
- queryString += " OR ";
- }
- queryString += " r.id = " + roomId;
- i++;
- }
-
- queryString += ")";
-
- TypedQuery<Room> q = em.createQuery(queryString,
Room.class);
-
- List<Room> ll = q.getResultList();
-
- return ll;
-
} catch (Exception ex2) {
log.error("[getRoomsByIds] ", ex2);
}
- return null;
+ return new LinkedList<Room>();
}
//
---------------------------------------------------------------------------------------------
Modified:
openmeetings/application/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/record/BatikMethods.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/record/BatikMethods.java?rev=1726998&r1=1726997&r2=1726998&view=diff
==============================================================================
---
openmeetings/application/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/record/BatikMethods.java
(original)
+++
openmeetings/application/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/record/BatikMethods.java
Wed Jan 27 11:21:25 2016
@@ -290,16 +290,16 @@ public class BatikMethods {
// log.debug("TEXT: "+stringsText);
// log.debug("TEXT: "+stringsText.length);
- String newText = "";
+ StringBuilder newText = new StringBuilder();
for (int i = 0; i < stringsText.length; i++) {
- newText += stringsText[i];
+ newText.append(stringsText[i]);
if (i + 1 < stringsText.length) {
- newText += "\n";
+ newText.append("\n");
}
}
- JTextArea n = new JTextArea(newText);
+ JTextArea n = new JTextArea(newText.toString());
n.setFont(font);
n.setWrapStyleWord(true);
n.setLineWrap(true);
Modified:
openmeetings/application/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/documents/LibraryChartLoader.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/documents/LibraryChartLoader.java?rev=1726998&r1=1726997&r2=1726998&view=diff
==============================================================================
---
openmeetings/application/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/documents/LibraryChartLoader.java
(original)
+++
openmeetings/application/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/documents/LibraryChartLoader.java
Wed Jan 27 11:21:25 2016
@@ -18,20 +18,24 @@
*/
package org.apache.openmeetings.core.documents;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
+
import java.io.BufferedReader;
import java.io.File;
-import java.io.FileReader;
-import java.io.IOException;
+import java.io.FileInputStream;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
-import org.apache.openmeetings.util.Logger;
+import org.red5.logging.Red5LoggerFactory;
+import org.slf4j.Logger;
import com.thoughtworks.xstream.XStream;
import com.thoughtworks.xstream.io.xml.XppDriver;
public class LibraryChartLoader {
-
- private static final Logger log = new Logger();
+ private static final Logger log =
Red5LoggerFactory.getLogger(LibraryWmlLoader.class, webAppRootKey);
private static final String fileExt = ".xchart";
@@ -49,7 +53,6 @@ public class LibraryChartLoader {
@SuppressWarnings("rawtypes")
public ArrayList loadChart(File dir, String fileName) {
- BufferedReader reader = null;
try {
File file = new File(dir, fileName + fileExt);
@@ -58,18 +61,14 @@ public class LibraryChartLoader {
XStream xStream = new XStream(new XppDriver());
xStream.setMode(XStream.NO_REFERENCES);
- reader = new BufferedReader(new FileReader(file));
- ArrayList lMapList = (ArrayList) xStream.fromXML(reader);
-
- return lMapList;
- } catch (Exception err) {
- log.error(err);
- } finally {
- if (reader != null) {
- try {
- reader.close();
- } catch (IOException e) {}
+ try (InputStream is = new FileInputStream(file);
+ BufferedReader reader = new
BufferedReader(new InputStreamReader(is, StandardCharsets.UTF_8)))
+ {
+ ArrayList lMapList = (ArrayList)
xStream.fromXML(reader);
+ return lMapList;
}
+ } catch (Exception err) {
+ log.error("Unexpected error while loading chart", err);
}
return null;
Modified:
openmeetings/application/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/documents/LibraryDocumentConverter.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/documents/LibraryDocumentConverter.java?rev=1726998&r1=1726997&r2=1726998&view=diff
==============================================================================
---
openmeetings/application/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/documents/LibraryDocumentConverter.java
(original)
+++
openmeetings/application/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/documents/LibraryDocumentConverter.java
Wed Jan 27 11:21:25 2016
@@ -18,13 +18,17 @@
*/
package org.apache.openmeetings.core.documents;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
+
import java.io.File;
-import java.io.FileWriter;
-import java.io.PrintWriter;
+import java.io.FileOutputStream;
+import java.io.OutputStream;
+import java.io.OutputStreamWriter;
+import java.io.Writer;
+import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import org.apache.openmeetings.util.OmFileHelper;
-import org.apache.openmeetings.util.OpenmeetingsVariables;
import org.apache.openmeetings.util.stringhandlers.StringComparer;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
@@ -33,13 +37,12 @@ import com.thoughtworks.xstream.XStream;
import com.thoughtworks.xstream.io.xml.XppDriver;
public class LibraryDocumentConverter {
- private static final Logger log =
Red5LoggerFactory.getLogger(LibraryDocumentConverter.class,
OpenmeetingsVariables.webAppRootKey);
+ private static final Logger log =
Red5LoggerFactory.getLogger(LibraryDocumentConverter.class, webAppRootKey);
private static final String fileExt = ".wml";
public static String writeToLocalFolder(String fileName,
@SuppressWarnings("rawtypes")ArrayList objList) {
try {
-
log.debug("filePath: " +
OmFileHelper.getUploadWmlDir().getCanonicalPath());
String fileNameExtName =
fileName.substring(fileName.length()-4,fileName.length());
@@ -49,14 +52,14 @@ public class LibraryDocumentConverter {
fileName =
StringComparer.getInstance().compareForRealPaths(fileName.substring(0,
fileName.length()));
}
- if (fileName.length()<=0){
+ if (fileName.length() <= 0){
//return new Long(-21);
return "-20";
}
//Add the Folder for the wmlFiles if it does not exist
yet
- File filePathComplete = new
File(OmFileHelper.getUploadWmlDir(), fileName + fileExt);
+ File file = new File(OmFileHelper.getUploadWmlDir(),
fileName + fileExt);
- if (filePathComplete.exists()){
+ if (file.exists()){
return "-20";
}
@@ -64,16 +67,18 @@ public class LibraryDocumentConverter {
xStream.setMode(XStream.NO_REFERENCES);
String xmlString = xStream.toXML(objList);
- log.debug("Write to "+filePathComplete);
+ log.debug("Write to " + file);
- PrintWriter pw = new PrintWriter(new
FileWriter(filePathComplete));
- pw.println(xmlString);
- pw.flush();
- pw.close();
+ try (OutputStream os = new FileOutputStream(file);
+ Writer out = new OutputStreamWriter(os,
StandardCharsets.UTF_8))
+ {
+ out.write(xmlString);
+ out.flush();
+ }
//return new Long(1);
- return filePathComplete.getCanonicalPath();
+ return file.getCanonicalPath();
} catch (Exception err){
log.error("writeToLocalFolder",err);
}
Modified:
openmeetings/application/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/UserService.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/UserService.java?rev=1726998&r1=1726997&r2=1726998&view=diff
==============================================================================
---
openmeetings/application/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/UserService.java
(original)
+++
openmeetings/application/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/UserService.java
Wed Jan 27 11:21:25 2016
@@ -122,7 +122,7 @@ public class UserService implements IUse
* REST call
* @return - true if user has sufficient permissions, false otherwise
*/
- public Boolean kickUserByStreamId(String SID, String streamid, long
serverId) {
+ public boolean kickUserByStreamId(String SID, String streamid, long
serverId) {
try {
Long userId = sessiondataDao.checkSession(SID);
// admins only
@@ -176,7 +176,7 @@ public class UserService implements IUse
* @param publicSID
* @return - true in case user have sufficient permissions, null
otherwise
*/
- public Boolean kickUserByPublicSID(String SID, String publicSID) {
+ public boolean kickUserByPublicSID(String SID, String publicSID) {
try {
Long userId = sessiondataDao.checkSession(SID);
// users only
@@ -204,20 +204,21 @@ public class UserService implements IUse
} catch (Exception err) {
log.error("[kickUserByPublicSID]", err);
}
- return null;
+ return false;
}
@Override
- public Boolean kickUserBySessionId(String SID, long userId, String
sessionId) {
+ public boolean kickUserBySessionId(String SID, long userId, String
sessionId) {
try {
Long users_id = sessiondataDao.checkSession(SID);
// admin only
if
(AuthLevelUtil.hasAdminLevel(userDao.getRights(users_id))) {
((IApplication)Application.get(wicketApplicationName)).invalidateClient(userId,
sessionId);
+ return true;
}
} catch (Exception err) {
log.error("[kickUserBySessionId]", err);
}
- return null;
+ return false;
}
}
Modified:
openmeetings/application/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/WhiteBoardService.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/WhiteBoardService.java?rev=1726998&r1=1726997&r2=1726998&view=diff
==============================================================================
---
openmeetings/application/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/WhiteBoardService.java
(original)
+++
openmeetings/application/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/WhiteBoardService.java
Wed Jan 27 11:21:25 2016
@@ -88,7 +88,7 @@ public class WhiteBoardService implement
return null;
}
- public Boolean deleteWhiteboard(Long whiteBoardId) {
+ public boolean deleteWhiteboard(Long whiteBoardId) {
try {
IConnection current = Red5.getConnectionLocal();
String streamid = current.getClient().getId();
@@ -104,13 +104,11 @@ public class WhiteBoardService implement
if (returnValue != null) {
return true;
- } else {
- return false;
}
} catch (Exception err) {
log.error("[deleteWhiteboard]", err);
}
- return null;
+ return false;
}
public WhiteboardObjectList getRoomItemsBy() {
Modified:
openmeetings/application/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/red5/ScopeApplicationAdapter.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/red5/ScopeApplicationAdapter.java?rev=1726998&r1=1726997&r2=1726998&view=diff
==============================================================================
---
openmeetings/application/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/red5/ScopeApplicationAdapter.java
(original)
+++
openmeetings/application/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/red5/ScopeApplicationAdapter.java
Wed Jan 27 11:21:25 2016
@@ -422,7 +422,7 @@ public class ScopeApplicationAdapter ext
*
* @param newPublicSID
*/
- public Boolean overwritePublicSID(String newPublicSID) {
+ public boolean overwritePublicSID(String newPublicSID) {
try {
log.debug("----------- overwritePublicSID");
IConnection current = Red5.getConnectionLocal();
@@ -438,7 +438,7 @@ public class ScopeApplicationAdapter ext
} catch (Exception err) {
log.error("[overwritePublicSID]", err);
}
- return null;
+ return false;
}
/**
@@ -1905,7 +1905,7 @@ public class ScopeApplicationAdapter ext
* recording instead of iterating through connections!
* @return true in case there is recording session, false otherwise,
null if any exception happend
*/
- public Boolean getInterviewRecordingStatus() {
+ public boolean getInterviewRecordingStatus() {
try {
IConnection current = Red5.getConnectionLocal();
@@ -1918,19 +1918,17 @@ public class ScopeApplicationAdapter ext
}
}
}
- return false;
} catch (Exception err) {
log.error("[getInterviewRecordingStatus]", err);
}
-
- return null;
+ return false;
}
/**
* @deprecated @see {@link
ScopeApplicationAdapter#getInterviewRecordingStatus()}
* @return - false if there were existing recording, true if recording
was started successfully, null if any exception happens
*/
- public Boolean startInterviewRecording() {
+ public boolean startInterviewRecording() {
try {
log.debug("----------- startInterviewRecording");
IConnection current = Red5.getConnectionLocal();
@@ -1974,11 +1972,11 @@ public class ScopeApplicationAdapter ext
} catch (Exception err) {
log.debug("[startInterviewRecording]", err);
}
- return null;
+ return false;
}
@SuppressWarnings({ "rawtypes" })
- public Boolean sendRemoteCursorEvent(final String streamid, Map
messageObj) {
+ public boolean sendRemoteCursorEvent(final String streamid, Map
messageObj) {
new MessageSender("sendRemoteCursorEvent", messageObj) {
@Override
@@ -1987,7 +1985,7 @@ public class ScopeApplicationAdapter ext
return
!SessionVariablesUtil.isScreenClient(client) ||
!conn.getClient().getId().equals(streamid);
}
}.start();
- return null;
+ return true;
}
private Long checkRecordingClient(IConnection conn) {
@@ -2023,7 +2021,7 @@ public class ScopeApplicationAdapter ext
*
* @return true if interview was found
*/
- private Boolean _stopInterviewRecording(Client currentClient, IScope
currentScope) {
+ private boolean _stopInterviewRecording(Client currentClient, IScope
currentScope) {
try {
log.debug("----------- stopInterviewRecording");
Long clientRecordingId = currentClient.getRecordingId();
@@ -2051,7 +2049,7 @@ public class ScopeApplicationAdapter ext
} catch (Exception err) {
log.debug("[stopInterviewRecording]", err);
}
- return null;
+ return false;
}
/**
Modified:
openmeetings/application/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/servlet/outputhandler/ExportToImage.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/servlet/outputhandler/ExportToImage.java?rev=1726998&r1=1726997&r2=1726998&view=diff
==============================================================================
---
openmeetings/application/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/servlet/outputhandler/ExportToImage.java
(original)
+++
openmeetings/application/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/servlet/outputhandler/ExportToImage.java
Wed Jan 27 11:21:25 2016
@@ -20,9 +20,11 @@ package org.apache.openmeetings.core.ser
import java.io.File;
import java.io.FileOutputStream;
-import java.io.FileWriter;
import java.io.IOException;
import java.io.OutputStream;
+import java.io.OutputStreamWriter;
+import java.io.Writer;
+import java.nio.charset.StandardCharsets;
import java.util.Date;
import java.util.List;
import java.util.Set;
@@ -132,8 +134,7 @@ public class ExportToImage extends BaseH
// Create an instance of the SVG Generator.
SVGGraphics2D svgGenerator = new
SVGGraphics2D(document);
- svgGenerator = WhiteboardMapToSVG.getInstance()
- .convertMapToSVG(svgGenerator,
whiteBoardMap);
+ svgGenerator =
WhiteboardMapToSVG.getInstance().convertMapToSVG(svgGenerator, whiteBoardMap);
// Finally, stream out SVG to the standard
output using
// UTF-8 encoding.
@@ -144,10 +145,12 @@ public class ExportToImage extends BaseH
String reqFilePrefix = fileName + "_" +
CalendarPatterns.getTimeForStreamId(new Date());
File svgFile = new File(uploadTempDir,
reqFilePrefix + ".svg");
log.debug("exported svg file: " +
svgFile.getCanonicalPath());
- FileWriter out = new FileWriter(svgFile);
- svgGenerator.stream(out, useCSS);
- out.flush();
- out.close();
+ try (OutputStream os = new
FileOutputStream(svgFile);
+ Writer out = new
OutputStreamWriter(os, StandardCharsets.UTF_8))
+ {
+ svgGenerator.stream(out, useCSS);
+ out.flush();
+ }
File expFile = new File(uploadTempDir,
reqFilePrefix + "." + exportType);
log.debug("exported file: " +
expFile.getCanonicalPath());
if ("svg".equals(exportType)) {
Modified:
openmeetings/application/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/session/SessionManager.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/session/SessionManager.java?rev=1726998&r1=1726997&r2=1726998&view=diff
==============================================================================
---
openmeetings/application/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/session/SessionManager.java
(original)
+++
openmeetings/application/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/session/SessionManager.java
Wed Jan 27 11:21:25 2016
@@ -167,7 +167,7 @@ public class SessionManager implements I
return null;
}
- public synchronized Boolean updateAVClientByStreamId(String
streamId, Client rcm, Server server) {
+ public synchronized boolean updateAVClientByStreamId(String
streamId, Client rcm, Server server) {
try {
// get the corresponding user session object
and update the settings
Client rclUsual =
getClientByPublicSID(rcm.getPublicSID(), server);
@@ -187,13 +187,14 @@ public class SessionManager implements I
}
updateClientByStreamId(streamId, rcm, false,
server);
+ return true;
} catch (Exception err) {
log.error("[updateAVClientByStreamId]", err);
}
- return null;
+ return false;
}
- public synchronized Boolean updateClientByStreamId(String
streamId,
+ public synchronized boolean updateClientByStreamId(String
streamId,
Client rcm, boolean updateRoomCount, Server
server) {
try {
@@ -204,27 +205,25 @@ public class SessionManager implements I
return true;
} else {
log.debug("Tried to update a non
existing Client " + streamId);
- return false;
}
} catch (Exception err) {
log.error("[updateClientByStreamId]", err);
}
- return null;
+ return false;
}
- public synchronized Boolean removeClient(String streamId,
Server server) {
+ public synchronized boolean removeClient(String streamId,
Server server) {
try {
if (cache.containsKey(server,streamId)) {
cache.remove(server,streamId);
return true;
} else {
log.debug("Tried to remove a non
existing Client " + streamId);
- return false;
}
} catch (Exception err) {
log.error("[removeClient]", err);
}
- return null;
+ return false;
}
public synchronized ArrayList<Client> getClientListByRoom(Long
roomId) {
@@ -355,14 +354,14 @@ public class SessionManager implements I
return sessionManager.getClientByUserId(userId);
}
- public Boolean updateAVClientByStreamId(String streamId, Client rcm,
Server server) {
+ public boolean updateAVClientByStreamId(String streamId, Client rcm,
Server server) {
if (server == null) {
server = serverUtil.getCurrentServer();
}
return sessionManager.updateAVClientByStreamId(streamId, rcm,
server);
}
- public Boolean updateClientByStreamId(String streamId, Client rcm,
+ public boolean updateClientByStreamId(String streamId, Client rcm,
boolean updateRoomCount, Server server) {
if (server == null) {
server = serverUtil.getCurrentServer();
@@ -371,7 +370,7 @@ public class SessionManager implements I
updateRoomCount, server);
}
- public Boolean removeClient(String streamId, Server server) {
+ public boolean removeClient(String streamId, Server server) {
if (server == null) {
server = serverUtil.getCurrentServer();
}
Modified:
openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/server/ISessionManager.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/server/ISessionManager.java?rev=1726998&r1=1726997&r2=1726998&view=diff
==============================================================================
---
openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/server/ISessionManager.java
(original)
+++
openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/server/ISessionManager.java
Wed Jan 27 11:21:25 2016
@@ -116,7 +116,7 @@ public interface ISessionManager {
* @param rcm
* @return
*/
- public abstract Boolean updateAVClientByStreamId(String streamId,
Client rcm, Server server);
+ public abstract boolean updateAVClientByStreamId(String streamId,
Client rcm, Server server);
/**
* Update the session object
@@ -131,7 +131,7 @@ public interface ISessionManager {
* true means the count for the room has to be updated
* @return
*/
- public abstract Boolean updateClientByStreamId(String streamId,
+ public abstract boolean updateClientByStreamId(String streamId,
Client rcm, boolean updateRoomCount, Server server);
/**
@@ -140,7 +140,7 @@ public interface ISessionManager {
* @param streamId
* @return
*/
- public abstract Boolean removeClient(String streamId, Server server);
+ public abstract boolean removeClient(String streamId, Server server);
/**
* Get all ClientList Objects of that room and domain This Function is
Modified:
openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/IUserManager.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/IUserManager.java?rev=1726998&r1=1726997&r2=1726998&view=diff
==============================================================================
---
openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/IUserManager.java
(original)
+++
openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/IUserManager.java
Wed Jan 27 11:21:25 2016
@@ -55,9 +55,9 @@ public interface IUserManager {
User loginOAuth(Map<String, String> params, long serverId) throws
IOException, NoSuchAlgorithmException;
/** TODO FIXME seems to be unused **/
- Boolean kickUserByStreamId(String SID, Long roomId);
+ boolean kickUserByStreamId(String SID, Long roomId);
- Boolean kickUserByPublicSID(String SID, String publicSID);
+ boolean kickUserByPublicSID(String SID, String publicSID);
Long logout(String SID, long userId);
Modified:
openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/IUserService.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/IUserService.java?rev=1726998&r1=1726997&r2=1726998&view=diff
==============================================================================
---
openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/IUserService.java
(original)
+++
openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/IUserService.java
Wed Jan 27 11:21:25 2016
@@ -20,7 +20,7 @@ package org.apache.openmeetings.db.dao.u
//FIXME HACK to bypass cross project compilation
public interface IUserService {
- Boolean kickUserByStreamId(String sid, String streamid, long serverId);
+ boolean kickUserByStreamId(String sid, String streamid, long serverId);
- Boolean kickUserBySessionId(String sid, long userId, String sessionId);
+ boolean kickUserBySessionId(String sid, long userId, String sessionId);
}
Modified:
openmeetings/application/branches/3.1.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/user/UserManager.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/user/UserManager.java?rev=1726998&r1=1726997&r2=1726998&view=diff
==============================================================================
---
openmeetings/application/branches/3.1.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/user/UserManager.java
(original)
+++
openmeetings/application/branches/3.1.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/user/UserManager.java
Wed Jan 27 11:21:25 2016
@@ -426,7 +426,7 @@ public class UserManager implements IUse
* @param room_id
* @return
*/
- public Boolean kickUserByStreamId(String SID, Long room_id) {
+ public boolean kickUserByStreamId(String SID, Long room_id) {
try {
Long users_id = sessiondataDao.checkSession(SID);
@@ -455,10 +455,10 @@ public class UserManager implements IUse
} catch (Exception err) {
log.error("[kickUserByStreamId]", err);
}
- return null;
+ return false;
}
- public Boolean kickUserByPublicSID(String SID, String publicSID) {
+ public boolean kickUserByPublicSID(String SID, String publicSID) {
try {
Long userId = sessiondataDao.checkSession(SID);
@@ -487,7 +487,7 @@ public class UserManager implements IUse
} catch (Exception err) {
log.error("[kickUserByStreamId]", err);
}
- return null;
+ return false;
}
public Long getLanguage(Locale loc) {
Modified:
openmeetings/application/branches/3.1.x/openmeetings-util/src/main/java/org/apache/openmeetings/util/stringhandlers/ChatString.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-util/src/main/java/org/apache/openmeetings/util/stringhandlers/ChatString.java?rev=1726998&r1=1726997&r2=1726998&view=diff
==============================================================================
---
openmeetings/application/branches/3.1.x/openmeetings-util/src/main/java/org/apache/openmeetings/util/stringhandlers/ChatString.java
(original)
+++
openmeetings/application/branches/3.1.x/openmeetings-util/src/main/java/org/apache/openmeetings/util/stringhandlers/ChatString.java
Wed Jan 27 11:21:25 2016
@@ -187,17 +187,14 @@ public class ChatString {
}
public static String link(String input) {
+ StringBuilder tReturn = new StringBuilder();
try {
-
- String tReturn = "";
-
String parts[] = input.split(" ");
for (int t = 0; t < parts.length; t++) {
-
String text = parts[t];
- // System.out.println("Part 1 "+text);
+ // log.debug("Part 1 "+text);
Matcher matcher = Pattern
.compile(
@@ -205,27 +202,19 @@ public class ChatString {
.matcher(text);
if (matcher.find()) {
- text = matcher
- .replaceFirst("<u><FONT
color=\"#0000CC\"><a href='"
- + text
+ "'>" + text + "</a></FONT></u>");
-
+ text = matcher.replaceFirst("<u><FONT
color=\"#0000CC\"><a href='" + text + "'>" + text + "</a></FONT></u>");
}
- // System.out.println("Part 2 "+text);
+ // log.debug("Part 2 "+text);
if (t != 0) {
- tReturn += " ";
+ tReturn.append(" ");
}
-
- tReturn += text;
-
+ tReturn.append(text);
}
-
- return tReturn;
-
} catch (Exception e) {
log.error("[link]", e);
}
- return "";
+ return tReturn.toString();
}
}
Modified:
openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/conference/RoomManager.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/conference/RoomManager.java?rev=1726998&r1=1726997&r2=1726998&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/conference/RoomManager.java
(original)
+++
openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/conference/RoomManager.java
Wed Jan 27 11:21:25 2016
@@ -280,37 +280,15 @@ public class RoomManager {
return null;
}
- public List<Room> getRoomsByIds(List<Integer> roomIds) {
+ public List<Room> getRoomsByIds(List<Long> roomIds) {
try {
- if (roomIds == null || roomIds.size() == 0) {
- return new LinkedList<Room>();
+ if (roomIds != null && !roomIds.isEmpty()) {
+ return roomDao.get(roomIds);
}
-
- String queryString = "SELECT r from Room r " + "WHERE ";
-
- queryString += "(";
-
- int i = 0;
- for (Integer roomId : roomIds) {
- if (i != 0) {
- queryString += " OR ";
- }
- queryString += " r.id = " + roomId;
- i++;
- }
-
- queryString += ")";
-
- TypedQuery<Room> q = em.createQuery(queryString,
Room.class);
-
- List<Room> ll = q.getResultList();
-
- return ll;
-
} catch (Exception ex2) {
log.error("[getRoomsByIds] ", ex2);
}
- return null;
+ return new LinkedList<Room>();
}
//
---------------------------------------------------------------------------------------------
Modified:
openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/record/BatikMethods.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/record/BatikMethods.java?rev=1726998&r1=1726997&r2=1726998&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/record/BatikMethods.java
(original)
+++
openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/record/BatikMethods.java
Wed Jan 27 11:21:25 2016
@@ -290,16 +290,16 @@ public class BatikMethods {
// log.debug("TEXT: "+stringsText);
// log.debug("TEXT: "+stringsText.length);
- String newText = "";
+ StringBuilder newText = new StringBuilder();
for (int i = 0; i < stringsText.length; i++) {
- newText += stringsText[i];
+ newText.append(stringsText[i]);
if (i + 1 < stringsText.length) {
- newText += "\n";
+ newText.append("\n");
}
}
- JTextArea n = new JTextArea(newText);
+ JTextArea n = new JTextArea(newText.toString());
n.setFont(font);
n.setWrapStyleWord(true);
n.setLineWrap(true);
Modified:
openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/documents/LibraryChartLoader.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/documents/LibraryChartLoader.java?rev=1726998&r1=1726997&r2=1726998&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/documents/LibraryChartLoader.java
(original)
+++
openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/documents/LibraryChartLoader.java
Wed Jan 27 11:21:25 2016
@@ -18,20 +18,24 @@
*/
package org.apache.openmeetings.core.documents;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
+
import java.io.BufferedReader;
import java.io.File;
-import java.io.FileReader;
-import java.io.IOException;
+import java.io.FileInputStream;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
-import org.apache.openmeetings.util.Logger;
+import org.red5.logging.Red5LoggerFactory;
+import org.slf4j.Logger;
import com.thoughtworks.xstream.XStream;
import com.thoughtworks.xstream.io.xml.XppDriver;
public class LibraryChartLoader {
-
- private static final Logger log = new Logger();
+ private static final Logger log =
Red5LoggerFactory.getLogger(LibraryWmlLoader.class, webAppRootKey);
private static final String fileExt = ".xchart";
@@ -49,7 +53,6 @@ public class LibraryChartLoader {
@SuppressWarnings("rawtypes")
public ArrayList loadChart(File dir, String fileName) {
- BufferedReader reader = null;
try {
File file = new File(dir, fileName + fileExt);
@@ -58,18 +61,14 @@ public class LibraryChartLoader {
XStream xStream = new XStream(new XppDriver());
xStream.setMode(XStream.NO_REFERENCES);
- reader = new BufferedReader(new FileReader(file));
- ArrayList lMapList = (ArrayList) xStream.fromXML(reader);
-
- return lMapList;
- } catch (Exception err) {
- log.error(err);
- } finally {
- if (reader != null) {
- try {
- reader.close();
- } catch (IOException e) {}
+ try (InputStream is = new FileInputStream(file);
+ BufferedReader reader = new
BufferedReader(new InputStreamReader(is, StandardCharsets.UTF_8)))
+ {
+ ArrayList lMapList = (ArrayList)
xStream.fromXML(reader);
+ return lMapList;
}
+ } catch (Exception err) {
+ log.error("Unexpected error while loading chart", err);
}
return null;
Modified:
openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/documents/LibraryDocumentConverter.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/documents/LibraryDocumentConverter.java?rev=1726998&r1=1726997&r2=1726998&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/documents/LibraryDocumentConverter.java
(original)
+++
openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/documents/LibraryDocumentConverter.java
Wed Jan 27 11:21:25 2016
@@ -18,13 +18,17 @@
*/
package org.apache.openmeetings.core.documents;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
+
import java.io.File;
-import java.io.FileWriter;
-import java.io.PrintWriter;
+import java.io.FileOutputStream;
+import java.io.OutputStream;
+import java.io.OutputStreamWriter;
+import java.io.Writer;
+import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import org.apache.openmeetings.util.OmFileHelper;
-import org.apache.openmeetings.util.OpenmeetingsVariables;
import org.apache.openmeetings.util.stringhandlers.StringComparer;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
@@ -33,13 +37,12 @@ import com.thoughtworks.xstream.XStream;
import com.thoughtworks.xstream.io.xml.XppDriver;
public class LibraryDocumentConverter {
- private static final Logger log =
Red5LoggerFactory.getLogger(LibraryDocumentConverter.class,
OpenmeetingsVariables.webAppRootKey);
+ private static final Logger log =
Red5LoggerFactory.getLogger(LibraryDocumentConverter.class, webAppRootKey);
private static final String fileExt = ".wml";
public static String writeToLocalFolder(String fileName,
@SuppressWarnings("rawtypes")ArrayList objList) {
try {
-
log.debug("filePath: " +
OmFileHelper.getUploadWmlDir().getCanonicalPath());
String fileNameExtName =
fileName.substring(fileName.length()-4,fileName.length());
@@ -49,14 +52,14 @@ public class LibraryDocumentConverter {
fileName =
StringComparer.getInstance().compareForRealPaths(fileName.substring(0,
fileName.length()));
}
- if (fileName.length()<=0){
+ if (fileName.length() <= 0){
//return new Long(-21);
return "-20";
}
//Add the Folder for the wmlFiles if it does not exist
yet
- File filePathComplete = new
File(OmFileHelper.getUploadWmlDir(), fileName + fileExt);
+ File file = new File(OmFileHelper.getUploadWmlDir(),
fileName + fileExt);
- if (filePathComplete.exists()){
+ if (file.exists()){
return "-20";
}
@@ -64,16 +67,18 @@ public class LibraryDocumentConverter {
xStream.setMode(XStream.NO_REFERENCES);
String xmlString = xStream.toXML(objList);
- log.debug("Write to "+filePathComplete);
+ log.debug("Write to " + file);
- PrintWriter pw = new PrintWriter(new
FileWriter(filePathComplete));
- pw.println(xmlString);
- pw.flush();
- pw.close();
+ try (OutputStream os = new FileOutputStream(file);
+ Writer out = new OutputStreamWriter(os,
StandardCharsets.UTF_8))
+ {
+ out.write(xmlString);
+ out.flush();
+ }
//return new Long(1);
- return filePathComplete.getCanonicalPath();
+ return file.getCanonicalPath();
} catch (Exception err){
log.error("writeToLocalFolder",err);
}
Modified:
openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/UserService.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/UserService.java?rev=1726998&r1=1726997&r2=1726998&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/UserService.java
(original)
+++
openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/UserService.java
Wed Jan 27 11:21:25 2016
@@ -106,7 +106,7 @@ public class UserService implements IUse
* REST call
* @return - true if user has sufficient permissions, false otherwise
*/
- public Boolean kickUserByStreamId(String SID, String streamid, long
serverId) {
+ public boolean kickUserByStreamId(String SID, String streamid, long
serverId) {
try {
Long userId = sessiondataDao.checkSession(SID);
// admins only
@@ -160,7 +160,7 @@ public class UserService implements IUse
* @param publicSID
* @return - true in case user have sufficient permissions, null
otherwise
*/
- public Boolean kickUserByPublicSID(String SID, String publicSID) {
+ public boolean kickUserByPublicSID(String SID, String publicSID) {
try {
Long userId = sessiondataDao.checkSession(SID);
// users only
@@ -188,20 +188,21 @@ public class UserService implements IUse
} catch (Exception err) {
log.error("[kickUserByPublicSID]", err);
}
- return null;
+ return false;
}
@Override
- public Boolean kickUserBySessionId(String SID, long userId, String
sessionId) {
+ public boolean kickUserBySessionId(String SID, long userId, String
sessionId) {
try {
Long users_id = sessiondataDao.checkSession(SID);
// admin only
if
(AuthLevelUtil.hasAdminLevel(userDao.getRights(users_id))) {
((IApplication)Application.get(wicketApplicationName)).invalidateClient(userId,
sessionId);
+ return true;
}
} catch (Exception err) {
log.error("[kickUserBySessionId]", err);
}
- return null;
+ return false;
}
}
Modified:
openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/WhiteBoardService.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/WhiteBoardService.java?rev=1726998&r1=1726997&r2=1726998&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/WhiteBoardService.java
(original)
+++
openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/WhiteBoardService.java
Wed Jan 27 11:21:25 2016
@@ -88,7 +88,7 @@ public class WhiteBoardService implement
return null;
}
- public Boolean deleteWhiteboard(Long whiteBoardId) {
+ public boolean deleteWhiteboard(Long whiteBoardId) {
try {
IConnection current = Red5.getConnectionLocal();
String streamid = current.getClient().getId();
@@ -104,13 +104,11 @@ public class WhiteBoardService implement
if (returnValue != null) {
return true;
- } else {
- return false;
}
} catch (Exception err) {
log.error("[deleteWhiteboard]", err);
}
- return null;
+ return false;
}
public WhiteboardObjectList getRoomItemsBy() {
Modified:
openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/red5/ScopeApplicationAdapter.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/red5/ScopeApplicationAdapter.java?rev=1726998&r1=1726997&r2=1726998&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/red5/ScopeApplicationAdapter.java
(original)
+++
openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/red5/ScopeApplicationAdapter.java
Wed Jan 27 11:21:25 2016
@@ -413,7 +413,7 @@ public class ScopeApplicationAdapter ext
*
* @param newPublicSID
*/
- public Boolean overwritePublicSID(String newPublicSID) {
+ public boolean overwritePublicSID(String newPublicSID) {
try {
log.debug("----------- overwritePublicSID");
IConnection current = Red5.getConnectionLocal();
@@ -429,7 +429,7 @@ public class ScopeApplicationAdapter ext
} catch (Exception err) {
log.error("[overwritePublicSID]", err);
}
- return null;
+ return false;
}
/**
@@ -1896,7 +1896,7 @@ public class ScopeApplicationAdapter ext
* recording instead of iterating through connections!
* @return true in case there is recording session, false otherwise,
null if any exception happend
*/
- public Boolean getInterviewRecordingStatus() {
+ public boolean getInterviewRecordingStatus() {
try {
IConnection current = Red5.getConnectionLocal();
@@ -1909,19 +1909,17 @@ public class ScopeApplicationAdapter ext
}
}
}
- return false;
} catch (Exception err) {
log.error("[getInterviewRecordingStatus]", err);
}
-
- return null;
+ return false;
}
/**
* @deprecated @see {@link
ScopeApplicationAdapter#getInterviewRecordingStatus()}
* @return - false if there were existing recording, true if recording
was started successfully, null if any exception happens
*/
- public Boolean startInterviewRecording() {
+ public boolean startInterviewRecording() {
try {
log.debug("----------- startInterviewRecording");
IConnection current = Red5.getConnectionLocal();
@@ -1965,11 +1963,11 @@ public class ScopeApplicationAdapter ext
} catch (Exception err) {
log.debug("[startInterviewRecording]", err);
}
- return null;
+ return false;
}
@SuppressWarnings({ "rawtypes" })
- public Boolean sendRemoteCursorEvent(final String streamid, Map
messageObj) {
+ public boolean sendRemoteCursorEvent(final String streamid, Map
messageObj) {
new MessageSender("sendRemoteCursorEvent", messageObj) {
@Override
@@ -1978,7 +1976,7 @@ public class ScopeApplicationAdapter ext
return
!SessionVariablesUtil.isScreenClient(client) ||
!conn.getClient().getId().equals(streamid);
}
}.start();
- return null;
+ return true;
}
private Long checkRecordingClient(IConnection conn) {
@@ -2014,7 +2012,7 @@ public class ScopeApplicationAdapter ext
*
* @return true if interview was found
*/
- private Boolean _stopInterviewRecording(Client currentClient, IScope
currentScope) {
+ private boolean _stopInterviewRecording(Client currentClient, IScope
currentScope) {
try {
log.debug("----------- stopInterviewRecording");
Long clientRecordingId = currentClient.getRecordingId();
@@ -2042,7 +2040,7 @@ public class ScopeApplicationAdapter ext
} catch (Exception err) {
log.debug("[stopInterviewRecording]", err);
}
- return null;
+ return false;
}
/**
Modified:
openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/servlet/outputhandler/ExportToImage.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/servlet/outputhandler/ExportToImage.java?rev=1726998&r1=1726997&r2=1726998&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/servlet/outputhandler/ExportToImage.java
(original)
+++
openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/servlet/outputhandler/ExportToImage.java
Wed Jan 27 11:21:25 2016
@@ -20,9 +20,11 @@ package org.apache.openmeetings.core.ser
import java.io.File;
import java.io.FileOutputStream;
-import java.io.FileWriter;
import java.io.IOException;
import java.io.OutputStream;
+import java.io.OutputStreamWriter;
+import java.io.Writer;
+import java.nio.charset.StandardCharsets;
import java.util.Date;
import java.util.List;
import java.util.Set;
@@ -132,8 +134,7 @@ public class ExportToImage extends BaseH
// Create an instance of the SVG Generator.
SVGGraphics2D svgGenerator = new
SVGGraphics2D(document);
- svgGenerator = WhiteboardMapToSVG.getInstance()
- .convertMapToSVG(svgGenerator,
whiteBoardMap);
+ svgGenerator =
WhiteboardMapToSVG.getInstance().convertMapToSVG(svgGenerator, whiteBoardMap);
// Finally, stream out SVG to the standard
output using
// UTF-8 encoding.
@@ -144,10 +145,12 @@ public class ExportToImage extends BaseH
String reqFilePrefix = fileName + "_" +
CalendarPatterns.getTimeForStreamId(new Date());
File svgFile = new File(uploadTempDir,
reqFilePrefix + ".svg");
log.debug("exported svg file: " +
svgFile.getCanonicalPath());
- FileWriter out = new FileWriter(svgFile);
- svgGenerator.stream(out, useCSS);
- out.flush();
- out.close();
+ try (OutputStream os = new
FileOutputStream(svgFile);
+ Writer out = new
OutputStreamWriter(os, StandardCharsets.UTF_8))
+ {
+ svgGenerator.stream(out, useCSS);
+ out.flush();
+ }
File expFile = new File(uploadTempDir,
reqFilePrefix + "." + exportType);
log.debug("exported file: " +
expFile.getCanonicalPath());
if ("svg".equals(exportType)) {
Modified:
openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/session/SessionManager.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/session/SessionManager.java?rev=1726998&r1=1726997&r2=1726998&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/session/SessionManager.java
(original)
+++
openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/session/SessionManager.java
Wed Jan 27 11:21:25 2016
@@ -167,7 +167,7 @@ public class SessionManager implements I
return null;
}
- public synchronized Boolean updateAVClientByStreamId(String
streamId, Client rcm, Server server) {
+ public synchronized boolean updateAVClientByStreamId(String
streamId, Client rcm, Server server) {
try {
// get the corresponding user session object
and update the settings
Client rclUsual =
getClientByPublicSID(rcm.getPublicSID(), server);
@@ -187,13 +187,14 @@ public class SessionManager implements I
}
updateClientByStreamId(streamId, rcm, false,
server);
+ return true;
} catch (Exception err) {
log.error("[updateAVClientByStreamId]", err);
}
- return null;
+ return false;
}
- public synchronized Boolean updateClientByStreamId(String
streamId,
+ public synchronized boolean updateClientByStreamId(String
streamId,
Client rcm, boolean updateRoomCount, Server
server) {
try {
@@ -204,27 +205,25 @@ public class SessionManager implements I
return true;
} else {
log.debug("Tried to update a non
existing Client " + streamId);
- return false;
}
} catch (Exception err) {
log.error("[updateClientByStreamId]", err);
}
- return null;
+ return false;
}
- public synchronized Boolean removeClient(String streamId,
Server server) {
+ public synchronized boolean removeClient(String streamId,
Server server) {
try {
if (cache.containsKey(server,streamId)) {
cache.remove(server,streamId);
return true;
} else {
log.debug("Tried to remove a non
existing Client " + streamId);
- return false;
}
} catch (Exception err) {
log.error("[removeClient]", err);
}
- return null;
+ return false;
}
public synchronized ArrayList<Client> getClientListByRoom(Long
roomId) {
@@ -355,14 +354,14 @@ public class SessionManager implements I
return sessionManager.getClientByUserId(userId);
}
- public Boolean updateAVClientByStreamId(String streamId, Client rcm,
Server server) {
+ public boolean updateAVClientByStreamId(String streamId, Client rcm,
Server server) {
if (server == null) {
server = serverUtil.getCurrentServer();
}
return sessionManager.updateAVClientByStreamId(streamId, rcm,
server);
}
- public Boolean updateClientByStreamId(String streamId, Client rcm,
+ public boolean updateClientByStreamId(String streamId, Client rcm,
boolean updateRoomCount, Server server) {
if (server == null) {
server = serverUtil.getCurrentServer();
@@ -371,7 +370,7 @@ public class SessionManager implements I
updateRoomCount, server);
}
- public Boolean removeClient(String streamId, Server server) {
+ public boolean removeClient(String streamId, Server server) {
if (server == null) {
server = serverUtil.getCurrentServer();
}
Modified:
openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/server/ISessionManager.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/server/ISessionManager.java?rev=1726998&r1=1726997&r2=1726998&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/server/ISessionManager.java
(original)
+++
openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/server/ISessionManager.java
Wed Jan 27 11:21:25 2016
@@ -116,7 +116,7 @@ public interface ISessionManager {
* @param rcm
* @return
*/
- public abstract Boolean updateAVClientByStreamId(String streamId,
Client rcm, Server server);
+ public abstract boolean updateAVClientByStreamId(String streamId,
Client rcm, Server server);
/**
* Update the session object
@@ -131,7 +131,7 @@ public interface ISessionManager {
* true means the count for the room has to be updated
* @return
*/
- public abstract Boolean updateClientByStreamId(String streamId,
+ public abstract boolean updateClientByStreamId(String streamId,
Client rcm, boolean updateRoomCount, Server server);
/**
@@ -140,7 +140,7 @@ public interface ISessionManager {
* @param streamId
* @return
*/
- public abstract Boolean removeClient(String streamId, Server server);
+ public abstract boolean removeClient(String streamId, Server server);
/**
* Get all ClientList Objects of that room and domain This Function is
Modified:
openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/IUserManager.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/IUserManager.java?rev=1726998&r1=1726997&r2=1726998&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/IUserManager.java
(original)
+++
openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/IUserManager.java
Wed Jan 27 11:21:25 2016
@@ -55,9 +55,9 @@ public interface IUserManager {
User loginOAuth(Map<String, String> params, long serverId) throws
IOException, NoSuchAlgorithmException;
/** TODO FIXME seems to be unused **/
- Boolean kickUserByStreamId(String SID, Long roomId);
+ boolean kickUserByStreamId(String SID, Long roomId);
- Boolean kickUserByPublicSID(String SID, String publicSID);
+ boolean kickUserByPublicSID(String SID, String publicSID);
Long logout(String SID, long userId);
Modified:
openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/IUserService.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/IUserService.java?rev=1726998&r1=1726997&r2=1726998&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/IUserService.java
(original)
+++
openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/IUserService.java
Wed Jan 27 11:21:25 2016
@@ -20,7 +20,7 @@ package org.apache.openmeetings.db.dao.u
//FIXME HACK to bypass cross project compilation
public interface IUserService {
- Boolean kickUserByStreamId(String sid, String streamid, long serverId);
+ boolean kickUserByStreamId(String sid, String streamid, long serverId);
- Boolean kickUserBySessionId(String sid, long userId, String sessionId);
+ boolean kickUserBySessionId(String sid, long userId, String sessionId);
}
Modified:
openmeetings/application/trunk/openmeetings-service/src/main/java/org/apache/openmeetings/service/user/UserManager.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-service/src/main/java/org/apache/openmeetings/service/user/UserManager.java?rev=1726998&r1=1726997&r2=1726998&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-service/src/main/java/org/apache/openmeetings/service/user/UserManager.java
(original)
+++
openmeetings/application/trunk/openmeetings-service/src/main/java/org/apache/openmeetings/service/user/UserManager.java
Wed Jan 27 11:21:25 2016
@@ -426,7 +426,7 @@ public class UserManager implements IUse
* @param room_id
* @return
*/
- public Boolean kickUserByStreamId(String SID, Long room_id) {
+ public boolean kickUserByStreamId(String SID, Long room_id) {
try {
Long users_id = sessiondataDao.checkSession(SID);
@@ -455,10 +455,10 @@ public class UserManager implements IUse
} catch (Exception err) {
log.error("[kickUserByStreamId]", err);
}
- return null;
+ return false;
}
- public Boolean kickUserByPublicSID(String SID, String publicSID) {
+ public boolean kickUserByPublicSID(String SID, String publicSID) {
try {
Long userId = sessiondataDao.checkSession(SID);
@@ -487,7 +487,7 @@ public class UserManager implements IUse
} catch (Exception err) {
log.error("[kickUserByStreamId]", err);
}
- return null;
+ return false;
}
public Long getLanguage(Locale loc) {
