metron-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ceste...@apache.org
Subject incubator-metron git commit: METRON-743: Sort the files when reading results from Pcap closes apache/incubator-metron#467
Date Wed, 01 Mar 2017 15:49:28 GMT
Repository: incubator-metron
Updated Branches:
  refs/heads/master 8b4fa79d1 -> e416a7d78


METRON-743: Sort the files when reading results from Pcap closes apache/incubator-metron#467


Project: http://git-wip-us.apache.org/repos/asf/incubator-metron/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-metron/commit/e416a7d7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-metron/tree/e416a7d7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-metron/diff/e416a7d7

Branch: refs/heads/master
Commit: e416a7d7852fb1a7566681d0d3f55cd256d1332e
Parents: 8b4fa79
Author: cstella <cestella@gmail.com>
Authored: Wed Mar 1 10:49:20 2017 -0500
Committer: cstella <cestella@gmail.com>
Committed: Wed Mar 1 10:49:20 2017 -0500

----------------------------------------------------------------------
 .../src/main/java/org/apache/metron/pcap/mr/PcapJob.java            | 1 +
 1 file changed, 1 insertion(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/e416a7d7/metron-platform/metron-pcap/src/main/java/org/apache/metron/pcap/mr/PcapJob.java
----------------------------------------------------------------------
diff --git a/metron-platform/metron-pcap/src/main/java/org/apache/metron/pcap/mr/PcapJob.java
b/metron-platform/metron-pcap/src/main/java/org/apache/metron/pcap/mr/PcapJob.java
index 1f124e9..3d4a4b3 100644
--- a/metron-platform/metron-pcap/src/main/java/org/apache/metron/pcap/mr/PcapJob.java
+++ b/metron-platform/metron-pcap/src/main/java/org/apache/metron/pcap/mr/PcapJob.java
@@ -197,6 +197,7 @@ public class PcapJob {
     if (LOG.isDebugEnabled()) {
       LOG.debug(outputPath);
     }
+    Collections.sort(files, (o1,o2) -> o1.getName().compareTo(o2.getName()));
     return new SequenceFileIterable(files, config);
   }
 


Mime
View raw message