Merge branch 'release'

appsmithorg · Aug 21, 2020 · b184197 · b184197
2 parents 28ea547 + 87f27c9
commit b184197
Show file tree

Hide file tree

Showing 2 changed files with 4,282 additions and 1,504 deletions.
diff --git a/...erver/appsmith-server/src/main/java/com/appsmith/server/migrations/DatabaseChangelog.java b/...erver/appsmith-server/src/main/java/com/appsmith/server/migrations/DatabaseChangelog.java
@@ -704,8 +704,10 @@ public void examplesOrganization(MongoTemplate mongoTemplate, EncryptionService
         for (final Map<String, Object> datasource : datasources) {
             datasource.put("pluginId", plugins.get(datasource.remove("$pluginPackageName")));
             final Map authentication = (Map) ((Map) datasource.get("datasourceConfiguration")).get("authentication");
-            final String plainPassword = (String) authentication.get("password");
-            authentication.put("password", encryptionService.encryptString(plainPassword));
+            if (authentication != null) {
+                final String plainPassword = (String) authentication.get("password");
+                authentication.put("password", encryptionService.encryptString(plainPassword));
+            }
             datasource.put(FieldName.ORGANIZATION_ID, organizationId);
             datasource.put(FieldName.CREATED_AT, Instant.now());
             final Map<String, Object> insertedDatasource = mongoTemplate.insert(datasource, mongoTemplate.getCollectionName(Datasource.class));