Repository: incubator-trafodion
Updated Branches:
  refs/heads/master b23fefd75 -> 3cdea3f9b


[TRAFODION-2129] Trafodion to avoid use of deprecated HBase APIs/Classes

Changes as per the review comments of PR 645


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

Branch: refs/heads/master
Commit: 258dd09c4317abcafff6b3ccc32a027272d547fd
Parents: 39e30d1
Author: selvaganesang <selva.govindara...@esgyn.com>
Authored: Wed Aug 10 00:36:12 2016 +0000
Committer: selvaganesang <selva.govindara...@esgyn.com>
Committed: Wed Aug 10 00:36:12 2016 +0000

----------------------------------------------------------------------
 .../hbase/client/transactional/TransactionManager.java    | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/258dd09c/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/client/transactional/TransactionManager.java
----------------------------------------------------------------------
diff --git 
a/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/client/transactional/TransactionManager.java
 
b/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/client/transactional/TransactionManager.java
index 0b4888e..e7a0597 100644
--- 
a/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/client/transactional/TransactionManager.java
+++ 
b/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/client/transactional/TransactionManager.java
@@ -2232,7 +2232,7 @@ public class TransactionManager {
                         if (retry) 
                             retrySleep = retry(retrySleep);
                     }
-                } while (retry == true);
+                } while (retry && retryCount++ <= RETRY_ATTEMPTS);
             }//while
     }
 
@@ -2262,7 +2262,7 @@ public class TransactionManager {
             if (retry) 
                 retrySleep = retry(retrySleep);
         }
-    } while (retry == true);
+    } while (retry && retryCount++ <= RETRY_ATTEMPTS);
 
     if (LOG.isTraceEnabled()) LOG.trace("doCommitDDL  EXIT [" + 
transactionState.getTransactionId() + "]");
 }
@@ -2436,7 +2436,7 @@ public class TransactionManager {
                         if (retry) 
                            retrySleep = retry(retrySleep);
                     }
-                } while(retry);
+                } while (retry && retryCount++ <= RETRY_ATTEMPTS);
             }//while
         }
 
@@ -2477,7 +2477,7 @@ public class TransactionManager {
                         if (retry) 
                            retrySleep = retry(retrySleep);
                     }
-                } while(retry);
+                } while (retry && retryCount++ <= RETRY_ATTEMPTS);
             }//while
         }
 
@@ -2547,7 +2547,7 @@ public class TransactionManager {
                 if (retry) 
                    retrySleep = retry(retrySleep);
             }
-        } while(retry);
+        } while (retry && retryCount++ <= RETRY_ATTEMPTS);
     }
 
     public synchronized JtaXAResource getXAResource() {

Reply via email to