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/04/29 18:20:46 UTC
tika git commit: TIKA-1964 -- clean up incorrect use of
BigInteger.add()
Repository: tika
Updated Branches:
refs/heads/master 6a1991896 -> 9f09a5586
TIKA-1964 -- clean up incorrect use of BigInteger.add()
Project: http://git-wip-us.apache.org/repos/asf/tika/repo
Commit: http://git-wip-us.apache.org/repos/asf/tika/commit/9f09a558
Tree: http://git-wip-us.apache.org/repos/asf/tika/tree/9f09a558
Diff: http://git-wip-us.apache.org/repos/asf/tika/diff/9f09a558
Branch: refs/heads/master
Commit: 9f09a558648bf2d8b17c611498e097db0513fb7d
Parents: 6a19918
Author: tballison <ta...@mitre.org>
Authored: Fri Apr 29 12:07:52 2016 -0400
Committer: tballison <ta...@mitre.org>
Committed: Fri Apr 29 12:07:52 2016 -0400
----------------------------------------------------------------------
.../tika/parser/mp4/DirectFileReadDataSource.java | 2 +-
.../java/org/apache/tika/parser/mp4/MP4Parser.java | 13 ++++---------
2 files changed, 5 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tika/blob/9f09a558/tika-parsers/src/main/java/org/apache/tika/parser/mp4/DirectFileReadDataSource.java
----------------------------------------------------------------------
diff --git a/tika-parsers/src/main/java/org/apache/tika/parser/mp4/DirectFileReadDataSource.java b/tika-parsers/src/main/java/org/apache/tika/parser/mp4/DirectFileReadDataSource.java
index f25b413..cde2548 100644
--- a/tika-parsers/src/main/java/org/apache/tika/parser/mp4/DirectFileReadDataSource.java
+++ b/tika-parsers/src/main/java/org/apache/tika/parser/mp4/DirectFileReadDataSource.java
@@ -102,7 +102,7 @@ public class DirectFileReadDataSource implements DataSource {
//make sure that start+size aren't greater than avail size
//in raf.
BigInteger end = BigInteger.valueOf(startPosition);
- end.add(BigInteger.valueOf(size));
+ end = end.add(BigInteger.valueOf(size));
if (end.compareTo(BigInteger.valueOf(raf.length())) > 0) {
throw new IOException("requesting read past end of stream");
}
http://git-wip-us.apache.org/repos/asf/tika/blob/9f09a558/tika-parsers/src/main/java/org/apache/tika/parser/mp4/MP4Parser.java
----------------------------------------------------------------------
diff --git a/tika-parsers/src/main/java/org/apache/tika/parser/mp4/MP4Parser.java b/tika-parsers/src/main/java/org/apache/tika/parser/mp4/MP4Parser.java
index db50e37..47e2f3d 100644
--- a/tika-parsers/src/main/java/org/apache/tika/parser/mp4/MP4Parser.java
+++ b/tika-parsers/src/main/java/org/apache/tika/parser/mp4/MP4Parser.java
@@ -135,9 +135,9 @@ public class MP4Parser extends AbstractParser {
if (fileType != null) {
// Identify the type
MediaType type = MediaType.application("mp4");
- for (MediaType t : typesMap.keySet()) {
- if (typesMap.get(t).contains(fileType.getMajorBrand())) {
- type = t;
+ for (Map.Entry<MediaType, List<String>> e : typesMap.entrySet()) {
+ if (e.getValue().contains(fileType.getMajorBrand())) {
+ type = e.getKey();
break;
}
}
@@ -301,12 +301,7 @@ public class MP4Parser extends AbstractParser {
}
}
-
- private static void addMetadata(String key, Metadata m, Utf8AppleDataBox metadata) {
- if (metadata != null) {
- m.add(key, metadata.getValue());
- }
- }
+
private static void addMetadata(Property prop, Metadata m, Utf8AppleDataBox metadata) {
if (metadata != null) {
m.set(prop, metadata.getValue());