fixing a bug of null pointer exception in LockManager
git-svn-id: https://asterixdb.googlecode.com/svn/branches/asterix_lsm_stabilization@1538 eaa15691-b419-025a-1212-ee371bd00084
diff --git a/asterix-transactions/src/main/java/edu/uci/ics/asterix/transaction/management/service/locking/LockManager.java b/asterix-transactions/src/main/java/edu/uci/ics/asterix/transaction/management/service/locking/LockManager.java
index 1d47c0b..aeb54b5 100644
--- a/asterix-transactions/src/main/java/edu/uci/ics/asterix/transaction/management/service/locking/LockManager.java
+++ b/asterix-transactions/src/main/java/edu/uci/ics/asterix/transaction/management/service/locking/LockManager.java
@@ -207,7 +207,7 @@
if (isEscalated) {
releaseDatasetISLocks(jobInfo, jobId, datasetId, txnContext);
}
- if (datasetLockMode == LockMode.IS) {
+ if (jobInfo != null && datasetLockMode == LockMode.IS) {
jobInfo.increaseDatasetISLockCount(dId);
}
}
@@ -1086,7 +1086,7 @@
if (isEscalated) {
releaseDatasetISLocks(jobInfo, jobId, datasetId, txnContext);
}
- if (datasetLockMode == LockMode.IS) {
+ if (jobInfo != null && datasetLockMode == LockMode.IS) {
jobInfo.increaseDatasetISLockCount(dId);
}
}