You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by mc...@apache.org on 2015/03/06 05:21:32 UTC
[18/50] incubator-nifi git commit: NIFI-296: Minor updates after code
review
NIFI-296: Minor updates after code review
Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/b418b890
Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/b418b890
Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/b418b890
Branch: refs/heads/NIFI-353
Commit: b418b890a63e328136b9f1a7e15e15b01fd8883a
Parents: 16fb2b8
Author: Adam Lamar <ad...@gmail.com>
Authored: Fri Feb 20 09:28:00 2015 +0000
Committer: Adam Lamar <ad...@gmail.com>
Committed: Fri Feb 20 09:28:00 2015 +0000
----------------------------------------------------------------------
.../org/apache/nifi/processors/standard/IdentifyMimeType.java | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/b418b890/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/IdentifyMimeType.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/IdentifyMimeType.java b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/IdentifyMimeType.java
index c9cb1cd..fd3d4ae 100644
--- a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/IdentifyMimeType.java
+++ b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/IdentifyMimeType.java
@@ -42,6 +42,7 @@ import org.apache.nifi.annotation.behavior.SideEffectFree;
import org.apache.nifi.annotation.behavior.SupportsBatching;
import org.apache.nifi.annotation.documentation.Tags;
import org.apache.nifi.processor.io.InputStreamCallback;
+import org.apache.nifi.stream.io.StreamUtils;
import org.apache.nifi.util.FlowFilePackagerV1;
import org.apache.nifi.util.FlowFilePackagerV3;
import org.apache.nifi.util.ObjectHolder;
@@ -146,7 +147,7 @@ public class IdentifyMimeType extends AbstractProcessor {
mimetype = config.getMimeRepository().forName(mediatype.toString());
extensionRef.set(mimetype.getExtension());
} catch (MimeTypeException ex) {
- logger.warn("MIME type detection failed: {}", new Object[]{ex.toString()});
+ logger.warn("MIME type detection failed: {}", new Object[]{ex});
}
}
}
@@ -183,7 +184,7 @@ public class IdentifyMimeType extends AbstractProcessor {
// Sanity check the stream. This may not be a tarfile at all
in.mark(FlowFilePackagerV1.FILENAME_ATTRIBUTES.length());
byte[] bytes = new byte[FlowFilePackagerV1.FILENAME_ATTRIBUTES.length()];
- in.read(bytes);
+ StreamUtils.fillBuffer(in, bytes, false);
in.reset();
// Quick exit if the first filename is not correct