diff --git a/security-admin/src/main/java/org/apache/ranger/db/XXGlobalStateDao.java b/security-admin/src/main/java/org/apache/ranger/db/XXGlobalStateDao.java
index 4f7e9d5..38cb1fd 100644
--- a/security-admin/src/main/java/org/apache/ranger/db/XXGlobalStateDao.java
+++ b/security-admin/src/main/java/org/apache/ranger/db/XXGlobalStateDao.java
@@ -74,7 +74,7 @@
             try {
                 XXGlobalState globalState = findByStateName(stateName);
                 if (globalState == null) {
-                    createGlobalStateForRoleVersion(globalState, stateName);
+                    createGlobalStateForRoleVersion(stateName);
                 } else {
                     updateGlobalStateForRoleVersion(globalState, stateName);
                 }
@@ -136,7 +136,8 @@
         }
     }
 
-    private void createGlobalStateForRoleVersion(XXGlobalState globalState, String stateName) {
+    private void createGlobalStateForRoleVersion(String stateName) {
+        XXGlobalState globalState = new XXGlobalState();
         globalState.setStateName(stateName);
         Map<String,String> roleVersion = new HashMap<>();
         roleVersion.put(APP_DATA_ENTRY_ROLE_VERSION,new String(Long.toString(1L)));
@@ -153,8 +154,7 @@
             update(globalState);
         } else {
             //if not present create Global State for Role Version.
-            XXGlobalState xxGlobalState = new XXGlobalState();
-            createGlobalStateForRoleVersion(xxGlobalState, stateName);
+            createGlobalStateForRoleVersion(stateName);
         }
     }
 }
