You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flume.apache.org by jm...@apache.org on 2011/08/10 10:03:27 UTC
svn commit: r1156059 - in /incubator/flume/trunk/flume-core/src:
main/java/com/cloudera/flume/core/extractors/RegexAllExtractor.java
test/java/com/cloudera/flume/core/extractors/TestExtractors.java
Author: jmhsieh
Date: Wed Aug 10 08:03:27 2011
New Revision: 1156059
URL: http://svn.apache.org/viewvc?rev=1156059&view=rev
Log:
FLUME-722: RegexAllExtractor doesn't ignore empty groups (Mingjie Lai)
Modified:
incubator/flume/trunk/flume-core/src/main/java/com/cloudera/flume/core/extractors/RegexAllExtractor.java
incubator/flume/trunk/flume-core/src/test/java/com/cloudera/flume/core/extractors/TestExtractors.java
Modified: incubator/flume/trunk/flume-core/src/main/java/com/cloudera/flume/core/extractors/RegexAllExtractor.java
URL: http://svn.apache.org/viewvc/incubator/flume/trunk/flume-core/src/main/java/com/cloudera/flume/core/extractors/RegexAllExtractor.java?rev=1156059&r1=1156058&r2=1156059&view=diff
==============================================================================
--- incubator/flume/trunk/flume-core/src/main/java/com/cloudera/flume/core/extractors/RegexAllExtractor.java (original)
+++ incubator/flume/trunk/flume-core/src/main/java/com/cloudera/flume/core/extractors/RegexAllExtractor.java Wed Aug 10 08:03:27 2011
@@ -91,7 +91,7 @@ public class RegexAllExtractor extends E
//Try/Catch so that we don't require there be the same number of names as patterns.
try {
//Ignore blank names. These are most likely sub patterns we don't care about keeping.
- if(names.get(grp-1) != ""){
+ if (!"".equals(names.get(grp-1))) {
Attributes.setString(e, names.get(grp-1), val);
}
} catch (IndexOutOfBoundsException ioobe) {
Modified: incubator/flume/trunk/flume-core/src/test/java/com/cloudera/flume/core/extractors/TestExtractors.java
URL: http://svn.apache.org/viewvc/incubator/flume/trunk/flume-core/src/test/java/com/cloudera/flume/core/extractors/TestExtractors.java?rev=1156059&r1=1156058&r2=1156059&view=diff
==============================================================================
--- incubator/flume/trunk/flume-core/src/test/java/com/cloudera/flume/core/extractors/TestExtractors.java (original)
+++ incubator/flume/trunk/flume-core/src/test/java/com/cloudera/flume/core/extractors/TestExtractors.java Wed Aug 10 08:03:27 2011
@@ -65,7 +65,7 @@ public class TestExtractors {
mem.open();
ArrayList<String> names = new ArrayList<String>();
names.add("d1");
- names.add("");
+ names.add(new String(""));
names.add("d2");
RegexAllExtractor re = new RegexAllExtractor(mem, "(\\d):(\\d):(\\d)",
@@ -79,6 +79,7 @@ public class TestExtractors {
mem.open();
Event e1 = mem.next();
assertEquals("1", Attributes.readString(e1, "d1"));
+ assertEquals(null, Attributes.readString(e1, ""));
assertEquals("3", Attributes.readString(e1, "d2"));
}