svn commit: r1348615 - in /incubator/openmeetings/trunk/singlewebapp: WebContent/swf10/screensharing/screenSharingDialog.lzx src/org/openmeetings/app/data/flvrecord/converter/FlvRecorderConverter.java

[sebawagner]

Author: sebawagner
Date: Sun Jun 10 15:23:43 2012
New Revision: 1348615

URL: http://svn.apache.org/viewvc?rev=1348615&view=rev
Log:
Fix scrollbars to common layout in screensharing viewer
Adds some debug to trace OPENMEETINGS-321

Modified:
    
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/screensharing/screenSharingDialog.lzx
    
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/flvrecord/converter/FlvRecorderConverter.java

Modified: 
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/screensharing/screenSharingDialog.lzx
URL: 
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/screensharing/screenSharingDialog.lzx?rev=1348615&r1=1348614&r2=1348615&view=diff
==============================================================================
--- 
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/screensharing/screenSharingDialog.lzx
 (original)
+++ 
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/screensharing/screenSharingDialog.lzx
 Sun Jun 10 15:23:43 2012
@@ -901,8 +901,8 @@
             
         </view>
         
-        <vscrollbar />
-        <hscrollbar />
+        <om_vscrollbar />
+        <om_hscrollbar />
         
     </view>    
     

Modified: 
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/flvrecord/converter/FlvRecorderConverter.java
URL: 
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/flvrecord/converter/FlvRecorderConverter.java?rev=1348615&r1=1348614&r2=1348615&view=diff
==============================================================================
--- 
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/flvrecord/converter/FlvRecorderConverter.java
 (original)
+++ 
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/flvrecord/converter/FlvRecorderConverter.java
 Sun Jun 10 15:23:43 2012
@@ -83,6 +83,11 @@ public class FlvRecorderConverter extend
                                        
.getFlvRecordingMetaDataScreenFlvByRecording(flvRecording
                                                        .getFlvRecordingId());
                        
+                       if (flvRecordingMetaDataOfScreen == null) {
+                               throw new 
Exception("flvRecordingMetaDataOfScreen is Null FlvRecordingId "+flvRecording
+                                                       .getFlvRecordingId());
+                       }
+                       
                        if 
(flvRecordingMetaDataOfScreen.getStreamReaderThreadComplete() == null) {
                                throw new Exception("StreamReaderThreadComplete 
Bit is NULL, error in recording");
                        }