svn commit: r826825 - in /hadoop/hdfs/branches/branch-0.21: CHANGES.txt src/test/aop/org/apache/hadoop/hdfs/HFlushAspects.aj

[co...@apache.org]

Author: cos
Date: Mon Oct 19 21:56:47 2009
New Revision: 826825

URL: http://svn.apache.org/viewvc?rev=826825&view=rev
Log:
HDFS-713. svn merge -c 826823 from trunk to branch0.21

Modified:
    hadoop/hdfs/branches/branch-0.21/CHANGES.txt
    hadoop/hdfs/branches/branch-0.21/src/test/aop/org/apache/hadoop/hdfs/HFlushAspects.aj

Modified: hadoop/hdfs/branches/branch-0.21/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/hdfs/branches/branch-0.21/CHANGES.txt?rev=826825&r1=826824&r2=826825&view=diff
==============================================================================
--- hadoop/hdfs/branches/branch-0.21/CHANGES.txt (original)
+++ hadoop/hdfs/branches/branch-0.21/CHANGES.txt Mon Oct 19 21:56:47 2009
@@ -268,6 +268,9 @@
     tests and changed SleepAction to support uniform random sleeping over an
     interval.  (szetszwo)
 
+    HDFS-713. Need to properly check the type of the test class from an aspect
+    (cos)
+
   BUG FIXES
 
     HDFS-76. Better error message to users when commands fail because of 

Modified: hadoop/hdfs/branches/branch-0.21/src/test/aop/org/apache/hadoop/hdfs/HFlushAspects.aj
URL: http://svn.apache.org/viewvc/hadoop/hdfs/branches/branch-0.21/src/test/aop/org/apache/hadoop/hdfs/HFlushAspects.aj?rev=826825&r1=826824&r2=826825&view=diff
==============================================================================
--- hadoop/hdfs/branches/branch-0.21/src/test/aop/org/apache/hadoop/hdfs/HFlushAspects.aj (original)
+++ hadoop/hdfs/branches/branch-0.21/src/test/aop/org/apache/hadoop/hdfs/HFlushAspects.aj Mon Oct 19 21:56:47 2009
@@ -23,6 +23,7 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.hadoop.fi.DataTransferTestUtil;
+import org.apache.hadoop.fi.PipelineTest;
 import org.apache.hadoop.fi.FiHFlushTestUtil.HFlushTest;
 import org.apache.hadoop.hdfs.DFSClient.DFSOutputStream;
 import org.apache.hadoop.hdfs.protocol.DatanodeInfo;
@@ -46,12 +47,14 @@
         LOG.info("No pipeline is built");
         return;
     }
-    if (DataTransferTestUtil.getPipelineTest() == null) {
+    PipelineTest pt = DataTransferTestUtil.getPipelineTest();
+    if (pt == null) {
         LOG.info("No test has been initialized");    
         return;
     }
-    for (int i=0; i<nodes.length; i++) {
-        ((HFlushTest)DataTransferTestUtil.getPipelineTest()).fiCallHFlush.run(nodes[i]);
-    }
+    if (pt instanceof HFlushTest)
+      for (int i=0; i<nodes.length; i++) {
+        ((HFlushTest)pt).fiCallHFlush.run(nodes[i]);
+      }
   }
 }