fix Sonar issues

klaus-sap · Jan 24, 2024 · 7ae6a2f · 7ae6a2f
1 parent 60b56d4
commit 7ae6a2f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/server/src/main/java/org/cloudfoundry/identity/uaa/scim/jdbc/JdbcScimUserProvisioning.java b/server/src/main/java/org/cloudfoundry/identity/uaa/scim/jdbc/JdbcScimUserProvisioning.java
@@ -588,7 +588,8 @@ private boolean isCheckOriginEnabled(String zoneId) {
 
     private void checkOrigin(String origin, String zoneId) {
         Integer count = jdbcTemplate.queryForObject("select count(*) from identity_provider where origin_key=? and identity_zone_id=? ", Integer.class, origin, zoneId);
-        if (count == 0) {
+        int c = (count == null) ? 0 : count;
+        if (c == 0) {
             throw new InvalidScimResourceException("Invalid origin " + origin + " in Identity Zone " + zoneId);
         }
     }

diff --git a/.../src/test/java/org/cloudfoundry/identity/uaa/scim/jdbc/JdbcScimUserProvisioningTests.java b/.../src/test/java/org/cloudfoundry/identity/uaa/scim/jdbc/JdbcScimUserProvisioningTests.java
@@ -1086,9 +1086,9 @@ void canCreateUserWithValidOrigin() {
         scimUser.setEmails(Collections.singletonList(email));
         scimUser.setPassword(randomString());
         scimUser.setOrigin(validOrigin);
+        idzManager.getCurrentIdentityZone().getConfig().getUserConfig().setCheckOriginEnabled(true);
         try {
-            idzManager.getCurrentIdentityZone().getConfig().getUserConfig().setCheckOriginEnabled(true);
-            scimUser = jdbcScimUserProvisioning.create(scimUser, currentIdentityZoneId);
+            jdbcScimUserProvisioning.create(scimUser, currentIdentityZoneId);
         } catch (InvalidScimResourceException e) {
             fail("Can't create user with valid origin when origin is checked");
         } finally {