Fixed permission synchronization issue that prevented new permissions…

… from being added to the database on upgrades.
DependencyTrack · Jun 20, 2018 · 36555b5 · 36555b5
1 parent 9868410
commit 36555b5
Showing 1 changed file with 5 additions and 6 deletions.
diff --git a/src/main/java/org/owasp/dependencytrack/persistence/DefaultObjectGenerator.java b/src/main/java/org/owasp/dependencytrack/persistence/DefaultObjectGenerator.java
@@ -57,9 +57,9 @@ public void contextInitialized(ServletContextEvent event) {
         Event.dispatch(new IndexEvent(IndexEvent.Action.COMMIT, Vulnerability.class));
         Event.dispatch(new IndexEvent(IndexEvent.Action.COMMIT, License.class));
 
-        loadDefaultLicenses();
         loadDefaultPermissions();
         loadDefaultPersonas();
+        loadDefaultLicenses();
         loadDefaultRepositories();
 
         try {
@@ -104,12 +104,11 @@ private void loadDefaultLicenses() {
      */
     private void loadDefaultPermissions() {
         try (QueryManager qm = new QueryManager()) {
-            if (qm.getPermissions().size() > 0) {
-                return;
-            }
-            LOGGER.info("Adding default permissions to datastore.");
+            LOGGER.info("Synchronizing permissions to datastore.");
             for (Permissions permission : Permissions.values()) {
-                qm.createPermission(permission.name(), permission.getDescription());
+                if (qm.getPermission(permission.name()) == null) {
+                    qm.createPermission(permission.name(), permission.getDescription());
+                }
             }
         }
     }