Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
fairblue
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Deploy
Releases
Container Registry
Model registry
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
hosting
chat
fairblue
Commits
03cd3e42
Unverified
Commit
03cd3e42
authored
6 years ago
by
Tiago D J
Committed by
GitHub
6 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Fixes presentation slide conversion timeout
Fixes #6311
parent
2e0660db
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
bbb-common-web/src/main/java/org/bigbluebutton/presentation/imp/PdfToSwfSlidesGenerationService.java
+3
-5
3 additions, 5 deletions
...ton/presentation/imp/PdfToSwfSlidesGenerationService.java
with
3 additions
and
5 deletions
bbb-common-web/src/main/java/org/bigbluebutton/presentation/imp/PdfToSwfSlidesGenerationService.java
+
3
−
5
View file @
03cd3e42
...
...
@@ -54,14 +54,12 @@ public class PdfToSwfSlidesGenerationService {
private
TextFileCreator
textFileCreator
;
private
SvgImageCreator
svgImageCreator
;
private
long
MAX_CONVERSION_TIME
=
5
*
60
*
1000L
;
private
long
MAX_CONVERSION_TIME
=
5
*
60
*
1000L
*
1000L
;
private
String
BLANK_SLIDE
;
private
int
MAX_SWF_FILE_SIZE
;
private
boolean
svgImagesRequired
;
private
boolean
generatePngs
;
private
static
final
long
CONVERSION_TIMEOUT
=
20000000000L
;
// 20s
public
PdfToSwfSlidesGenerationService
(
int
numConversionThreads
)
{
executor
=
Executors
.
newFixedThreadPool
(
numConversionThreads
);
}
...
...
@@ -194,7 +192,7 @@ public class PdfToSwfSlidesGenerationService {
};
Future
<
PdfToSwfSlide
>
f
=
executor
.
submit
(
c
);
long
endNanos
=
System
.
nanoTime
()
+
CONVERSION_TIME
OUT
;
long
endNanos
=
System
.
nanoTime
()
+
MAX_
CONVERSION_TIME
;
try
{
// Only wait for the remaining time budget
long
timeLeft
=
endNanos
-
System
.
nanoTime
();
...
...
@@ -346,7 +344,7 @@ public class PdfToSwfSlidesGenerationService {
}
public
void
setMaxConversionTime
(
int
minutes
)
{
MAX_CONVERSION_TIME
=
minutes
*
60
*
1000L
;
MAX_CONVERSION_TIME
=
minutes
*
60
*
1000L
*
1000L
;
}
public
void
setSwfSlidesGenerationProgressNotifier
(
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment