From 0ae9cbb3a4b36b412d2372f3849c0c2e447f82dc Mon Sep 17 00:00:00 2001
From: Konstantin Boudnik <cos@apache.org>
Date: Sat, 10 Jul 2010 20:55:45 +0000
Subject: [PATCH] HADOOP-6819. [Herriot] Shell command for getting the new
 exceptions in the logs returning exitcode 1 after executing successfully.
 Contributed by Vinay Thota.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@962914 13f79535-47bb-0310-9956-ffa450edef68
---
 CHANGES.txt                                                   | 4 ++++
 .../aop/org/apache/hadoop/test/system/DaemonProtocolAspect.aj | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 796011a902..a38ccf3d1c 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1023,6 +1023,10 @@ Release 0.21.0 - Unreleased
 
   BUG FIXES
 
+    HADOOP-6819. [Herriot] Shell command for getting the new exceptions in
+    the logs returning exitcode 1 after executing successfully. (Vinay Thota
+    via cos)
+
     HADOOP-6847. Problem staging 0.21.0 artifacts to Apache Nexus Maven
     Repository (Giridharan Kesavan via cos)
 
diff --git a/src/test/system/aop/org/apache/hadoop/test/system/DaemonProtocolAspect.aj b/src/test/system/aop/org/apache/hadoop/test/system/DaemonProtocolAspect.aj
index 23860d2bfb..3f49dbf08a 100644
--- a/src/test/system/aop/org/apache/hadoop/test/system/DaemonProtocolAspect.aj
+++ b/src/test/system/aop/org/apache/hadoop/test/system/DaemonProtocolAspect.aj
@@ -264,7 +264,7 @@ public aspect DaemonProtocolAspect {
         if (index++ < list.length -1) {
            filterExpPattern.append("grep -v " + excludeExp + " | ");
         } else {
-           filterExpPattern.append("grep -vc " + excludeExp);
+           filterExpPattern.append("grep -v " + excludeExp + " | wc -l");
         }
       }
       cmd = new String[] {