svn commit: r1346633 - in /incubator/ambari/branches/ambari-186: CHANGES.txt hmc/php/frontend/fetchTxnProgress.php

[vi...@apache.org]

Author: vikram
Date: Tue Jun  5 22:32:50 2012
New Revision: 1346633

URL: http://svn.apache.org/viewvc?rev=1346633&view=rev
Log:
AMBARI-345. Make TxnProgressWidget More Robust In The Face Of Un-Ready Txn Stages  (Contributed by Varun)

Modified:
    incubator/ambari/branches/ambari-186/CHANGES.txt
    incubator/ambari/branches/ambari-186/hmc/php/frontend/fetchTxnProgress.php

Modified: incubator/ambari/branches/ambari-186/CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/ambari-186/CHANGES.txt?rev=1346633&r1=1346632&r2=1346633&view=diff
==============================================================================
--- incubator/ambari/branches/ambari-186/CHANGES.txt (original)
+++ incubator/ambari/branches/ambari-186/CHANGES.txt Tue Jun  5 22:32:50 2012
@@ -6,6 +6,8 @@ characters wide.
 
 Release 0.1.x - unreleased
 
+  AMBARI-345. Make TxnProgressWidget More Robust In The Face Of Un-Ready Txn Stages (Varun via Vikram)
+
   AMBARI-346. user should not be allowed to change the paths to various directories on the advance config page (Hitesh via Vikram)
 
   AMBARI-316. Grid mount points page doesn't let one pass with only a custom mount point (Vinod via Vikram)

Modified: incubator/ambari/branches/ambari-186/hmc/php/frontend/fetchTxnProgress.php
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/ambari-186/hmc/php/frontend/fetchTxnProgress.php?rev=1346633&r1=1346632&r2=1346633&view=diff
==============================================================================
--- incubator/ambari/branches/ambari-186/hmc/php/frontend/fetchTxnProgress.php (original)
+++ incubator/ambari/branches/ambari-186/hmc/php/frontend/fetchTxnProgress.php Tue Jun  5 22:32:50 2012
@@ -688,6 +688,13 @@ foreach( $progress['subTxns'] as &$progr
 
 $lastTransaction = $progressSubTxn;
 
+/* If at least one subTxn isn't in progress, signal to the frontend that 
+ * there's nothing worthy for it to process yet. 
+ */
+if (!$atLeastOneSubTxnInProgress) {
+  $progress['subTxns'] = null;
+}
+
 $dbAccessor = new HMCDBAccessor($GLOBALS["DB_PATH"]);
 
 if (($progress['processRunning'] == FALSE) || ($progress['encounteredError'] == TRUE)) {
@@ -718,7 +725,7 @@ unset( $progress['error'] );
 $jsonOutput = array(
     'clusterName' => $clusterName,
     'txnId' => $txnId,
-    'progress' => $atLeastOneSubTxnInProgress ? $progress : null );
+    'progress' => $progress );
 
 if ($deployUser != null) {
     $jsonOutput['deployUser'] = $deployUser;