Author: sebawagner
Date: Tue Mar 6 17:45:41 2012
New Revision: 1297594
URL: http://svn.apache.org/viewvc?rev=1297594&view=rev
Log:
getParams method and isAvClient to false initialization in connection for main
RTMPConnection
Modified:
incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/remote/red5/ScopeApplicationAdapter.java
incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/servlet/outputhandler/AbstractUploadController.java
incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/servlet/outputhandler/BackupImportController.java
incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/servlet/outputhandler/UploadController.java
Modified:
incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/remote/red5/ScopeApplicationAdapter.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/remote/red5/ScopeApplicationAdapter.java?rev=1297594&r1=1297593&r2=1297594&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/remote/red5/ScopeApplicationAdapter.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/remote/red5/ScopeApplicationAdapter.java
Tue Mar 6 17:45:41 2012
@@ -446,6 +446,9 @@ public class ScopeApplicationAdapter ext
IConnection current = Red5.getConnectionLocal();
RoomClient currentClient = this.clientListManager
.getClientByStreamId(current.getClient().getId());
+ currentClient.setIsAVClient(false);
+
clientListManager.updateClientByStreamId(current.getClient().getId(),
+ currentClient);
return currentClient.getPublicSID();
}
Modified:
incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/servlet/outputhandler/AbstractUploadController.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/servlet/outputhandler/AbstractUploadController.java?rev=1297594&r1=1297593&r2=1297594&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/servlet/outputhandler/AbstractUploadController.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/servlet/outputhandler/AbstractUploadController.java
Tue Mar 6 17:45:41 2012
@@ -1,5 +1,6 @@
package org.openmeetings.servlet.outputhandler;
+import java.lang.reflect.Constructor;
import java.util.HashMap;
import javax.servlet.ServletContext;
@@ -42,14 +43,36 @@ public abstract class AbstractUploadCont
, pSID
, pPublicSID
}
-
- protected <T> T getParam(HashMap<UploadParams, Object> params,
UploadParams param, Class<T> type) {
- return getParam(params, param);
- }
- @SuppressWarnings("unchecked")
- protected <T> T getParam(HashMap<UploadParams, Object> params,
UploadParams param) {
- return params.containsKey(param) ? (T)params.get(param) : null;
+ /**
+ *
+ * @param params
+ * @param param
+ * @param typeObject
+ * @return
+ */
+ protected <T> T getParam(HashMap<UploadParams, Object> params,
+ UploadParams param, Class<T> typeObject) {
+ try {
+ Object returnValue = params.get(param);
+ if (returnValue == null) {
+ return null;
+ }
+
+ // Either this can be directly assigned or try to find
a constructor
+ // that handles it
+ if
(typeObject.isAssignableFrom(returnValue.getClass())) {
+ return typeObject.cast(returnValue);
+ }
+ Constructor<T> c = typeObject
+ .getConstructor(returnValue.getClass());
+ return c.newInstance(returnValue);
+
+ } catch (Exception err) {
+ log.error("cannot be cast to return type, error in
parameters for upload: "
+ + param, err);
+ return null;
+ }
}
protected HashMap<UploadParams, Object> validate(HttpServletRequest
request, boolean admin) throws ServletException {
Modified:
incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/servlet/outputhandler/BackupImportController.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/servlet/outputhandler/BackupImportController.java?rev=1297594&r1=1297593&r2=1297594&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/servlet/outputhandler/BackupImportController.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/servlet/outputhandler/BackupImportController.java
Tue Mar 6 17:45:41 2012
@@ -167,7 +167,7 @@ public class BackupImportController exte
working_dirFile.mkdir();
}
- MultipartFile multipartFile = getParam(params,
UploadParams.pFile);
+ MultipartFile multipartFile = getParam(params,
UploadParams.pFile, MultipartFile.class);
InputStream is = multipartFile.getInputStream();
String fileSystemName =
multipartFile.getOriginalFilename();
Modified:
incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/servlet/outputhandler/UploadController.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/servlet/outputhandler/UploadController.java?rev=1297594&r1=1297593&r2=1297594&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/servlet/outputhandler/UploadController.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/servlet/outputhandler/UploadController.java
Tue Mar 6 17:45:41 2012
@@ -84,7 +84,7 @@ public class UploadController extends Ab
String current_dir = context.getRealPath("/");
- MultipartFile multipartFile = getParam(params,
UploadParams.pFile);
+ MultipartFile multipartFile = getParam(params,
UploadParams.pFile, MultipartFile.class);
InputStream is = multipartFile.getInputStream();
String fileSystemName =
multipartFile.getOriginalFilename();
log.debug("fileSystemName: " + fileSystemName);
@@ -137,7 +137,7 @@ public class UploadController extends Ab
}
boolean userProfile = moduleName.equals("userprofile");
- MultipartFile multipartFile = getParam(params,
UploadParams.pFile);
+ MultipartFile multipartFile = getParam(params,
UploadParams.pFile, MultipartFile.class);
InputStream is = multipartFile.getInputStream();
String fileSystemName =
multipartFile.getOriginalFilename();
fileSystemName =
StringUtils.deleteWhitespace(fileSystemName);
