simplify jdbc read-only fallback code

AthenZ · Aug 1, 2017 · 65eac9d · 65eac9d
1 parent 55af82d
commit 65eac9d
Showing 1 changed file with 3 additions and 9 deletions.
diff --git a/servers/zms/src/main/java/com/yahoo/athenz/zms/ZMSImpl.java b/servers/zms/src/main/java/com/yahoo/athenz/zms/ZMSImpl.java
@@ -557,15 +557,9 @@ void loadObjectStore() {
             PoolableDataSource readOnlySrc = null;
             String jdbcReadOnlyStore = System.getProperty(ZMSConsts.ZMS_PROP_JDBC_RO_STORE);
             if (jdbcReadOnlyStore != null && jdbcReadOnlyStore.startsWith("jdbc:")) {
-                String jdbcReadOnlyUser = System.getProperty(ZMSConsts.ZMS_PROP_JDBC_RO_USER);
-                if (jdbcReadOnlyUser == null) {
-                    jdbcReadOnlyUser = jdbcUser;
-                }
-                password = System.getProperty(ZMSConsts.ZMS_PROP_JDBC_RO_PASSWORD, "");
-                String jdbcReadOnlyPassword = keyStore.getApplicationSecret(JDBC, password);
-                if (jdbcReadOnlyPassword == null) {
-                    jdbcReadOnlyPassword = jdbcPassword;
-                }
+                String jdbcReadOnlyUser = System.getProperty(ZMSConsts.ZMS_PROP_JDBC_RO_USER, jdbcUser);
+                String readOnlyPassword = System.getProperty(ZMSConsts.ZMS_PROP_JDBC_RO_PASSWORD, password);
+                String jdbcReadOnlyPassword = keyStore.getApplicationSecret(JDBC, readOnlyPassword);
                 readOnlySrc = DataSourceFactory.create(jdbcReadOnlyStore,
                         jdbcReadOnlyUser, jdbcReadOnlyPassword);
             }