You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tika.apache.org by ta...@apache.org on 2016/08/11 18:46:37 UTC
tika git commit: clean up MatParser
Repository: tika
Updated Branches:
refs/heads/master 85e538500 -> 8a68b5d47
clean up MatParser
Project: http://git-wip-us.apache.org/repos/asf/tika/repo
Commit: http://git-wip-us.apache.org/repos/asf/tika/commit/8a68b5d4
Tree: http://git-wip-us.apache.org/repos/asf/tika/tree/8a68b5d4
Diff: http://git-wip-us.apache.org/repos/asf/tika/diff/8a68b5d4
Branch: refs/heads/master
Commit: 8a68b5d474205cc91cbbb610d4a1c05af57f0610
Parents: 85e5385
Author: tballison <ta...@mitre.org>
Authored: Thu Aug 11 14:46:26 2016 -0400
Committer: tballison <ta...@mitre.org>
Committed: Thu Aug 11 14:46:26 2016 -0400
----------------------------------------------------------------------
tika-parsers/pom.xml | 4 ++--
.../src/main/java/org/apache/tika/parser/mat/MatParser.java | 5 +++++
2 files changed, 7 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tika/blob/8a68b5d4/tika-parsers/pom.xml
----------------------------------------------------------------------
diff --git a/tika-parsers/pom.xml b/tika-parsers/pom.xml
index cb7e199..532a91e 100644
--- a/tika-parsers/pom.xml
+++ b/tika-parsers/pom.xml
@@ -108,9 +108,9 @@
<!-- Upstream parser libraries -->
<dependency>
- <groupId>net.sourceforge.jmatio</groupId>
+ <groupId>org.tallison</groupId>
<artifactId>jmatio</artifactId>
- <version>1.0</version>
+ <version>1.2</version>
</dependency>
<dependency>
<groupId>org.apache.james</groupId>
http://git-wip-us.apache.org/repos/asf/tika/blob/8a68b5d4/tika-parsers/src/main/java/org/apache/tika/parser/mat/MatParser.java
----------------------------------------------------------------------
diff --git a/tika-parsers/src/main/java/org/apache/tika/parser/mat/MatParser.java b/tika-parsers/src/main/java/org/apache/tika/parser/mat/MatParser.java
index 284375f..3fbefb0 100644
--- a/tika-parsers/src/main/java/org/apache/tika/parser/mat/MatParser.java
+++ b/tika-parsers/src/main/java/org/apache/tika/parser/mat/MatParser.java
@@ -45,6 +45,11 @@ import org.xml.sax.SAXException;
public class MatParser extends AbstractParser {
+ static {
+ //make sure that this is set to false
+ MatFileReader.setAllowObjectDeserialization(false);
+ }
+
public static final String MATLAB_MIME_TYPE =
"application/x-matlab-data";