Fix orgId fallback for blank configured values

Author: cursoragent

sentry/src/main/java/io/sentry/SentryOptions.java

@@ -2337,7 +2337,7 @@ public void setOrgId(final @Nullable String orgId) {
    */
   @ApiStatus.Internal
   public @Nullable String getEffectiveOrgId() {
-    if (orgId != null) {
+    if (orgId != null && !orgId.trim().isEmpty()) {
       return orgId;
     }
     try {

sentry/src/test/java/io/sentry/SentryOptionsTest.kt

@@ -1019,6 +1019,19 @@ class SentryOptionsTest {
     assertEquals("999", options.effectiveOrgId)
   }
 
+  @Test
+  fun `getEffectiveOrgId falls back to DSN org id when explicit orgId is empty or blank`() {
+    val emptyOrgIdOptions = SentryOptions()
+    emptyOrgIdOptions.dsn = "https://key@o123.ingest.sentry.io/456"
+    emptyOrgIdOptions.orgId = ""
+    assertEquals("123", emptyOrgIdOptions.effectiveOrgId)
+
+    val blankOrgIdOptions = SentryOptions()
+    blankOrgIdOptions.dsn = "https://key@o123.ingest.sentry.io/456"
+    blankOrgIdOptions.orgId = "   "
+    assertEquals("123", blankOrgIdOptions.effectiveOrgId)
+  }
+
   @Test
   fun `getEffectiveOrgId falls back to DSN org id`() {
     val options = SentryOptions()