Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
OLAT CI-CD Testing Project
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Requirements
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Package Registry
Container Registry
Model registry
Operate
Terraform modules
Monitor
Service Desk
Analyze
Contributor analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Lars Oliver Dam
OLAT CI-CD Testing Project
Commits
2467c301
Commit
2467c301
authored
10 years ago
by
srosse
Browse files
Options
Downloads
Patches
Plain Diff
OO-1369: catch more exceptions and errors thrown by the jcodec library
parent
67c43c2e
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
src/main/java/org/olat/core/commons/services/video/MovieServiceImpl.java
+3
-4
3 additions, 4 deletions
...rg/olat/core/commons/services/video/MovieServiceImpl.java
with
3 additions
and
4 deletions
src/main/java/org/olat/core/commons/services/video/MovieServiceImpl.java
+
3
−
4
View file @
2467c301
...
@@ -22,7 +22,6 @@ package org.olat.core.commons.services.video;
...
@@ -22,7 +22,6 @@ package org.olat.core.commons.services.video;
import
java.awt.image.BufferedImage
;
import
java.awt.image.BufferedImage
;
import
java.io.File
;
import
java.io.File
;
import
java.io.FileInputStream
;
import
java.io.FileInputStream
;
import
java.io.IOException
;
import
java.io.InputStream
;
import
java.io.InputStream
;
import
java.io.RandomAccessFile
;
import
java.io.RandomAccessFile
;
import
java.nio.channels.FileChannel
;
import
java.nio.channels.FileChannel
;
...
@@ -90,7 +89,7 @@ public class MovieServiceImpl implements MovieService, ThumbnailSPI {
...
@@ -90,7 +89,7 @@ public class MovieServiceImpl implements MovieService, ThumbnailSPI {
int
w
=
size
.
getWidth
();
int
w
=
size
.
getWidth
();
int
h
=
size
.
getHeight
();
int
h
=
size
.
getHeight
();
return
new
Size
(
w
,
h
,
false
);
return
new
Size
(
w
,
h
,
false
);
}
catch
(
IO
Exception
e
)
{
}
catch
(
Exception
|
AssertionError
e
)
{
log
.
error
(
"Cannot extract size of: "
+
media
,
e
);
log
.
error
(
"Cannot extract size of: "
+
media
,
e
);
}
}
}
else
if
(
suffix
.
equals
(
"flv"
))
{
}
else
if
(
suffix
.
equals
(
"flv"
))
{
...
@@ -124,8 +123,8 @@ public class MovieServiceImpl implements MovieService, ThumbnailSPI {
...
@@ -124,8 +123,8 @@ public class MovieServiceImpl implements MovieService, ThumbnailSPI {
size
=
new
FinalSize
(
scaledSize
.
getWidth
(),
scaledSize
.
getHeight
());
size
=
new
FinalSize
(
scaledSize
.
getWidth
(),
scaledSize
.
getHeight
());
}
}
//NullPointerException can be thrown if the jcodec cannot handle the codec of the movie
//NullPointerException can be thrown if the jcodec cannot handle the codec of the movie
//ArrayIndexOutOfBoundsException
//ArrayIndexOutOfBoundsException
}
catch
(
Exception
e
)
{
}
catch
(
Exception
|
AssertionError
e
)
{
log
.
error
(
""
,
e
);
log
.
error
(
""
,
e
);
}
}
}
}
...
...
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