svn commit: r1930938 - pdfbox/branches/2.0/xmpbox/src/main/java/org/apache/xmpbox/type

[tilman]

Author: tilman
Date: Sun Dec 28 18:15:11 2025
New Revision: 1930938

Log:
PDFBOX-6133: refactor

Modified:
   
pdfbox/branches/2.0/xmpbox/src/main/java/org/apache/xmpbox/type/TypeMapping.java

Modified: 
pdfbox/branches/2.0/xmpbox/src/main/java/org/apache/xmpbox/type/TypeMapping.java
==============================================================================
--- 
pdfbox/branches/2.0/xmpbox/src/main/java/org/apache/xmpbox/type/TypeMapping.java
    Sun Dec 28 17:51:57 2025        (r1930937)
+++ 
pdfbox/branches/2.0/xmpbox/src/main/java/org/apache/xmpbox/type/TypeMapping.java
    Sun Dec 28 18:15:11 2025        (r1930938)
@@ -440,22 +440,19 @@ public final class TypeMapping
             }
             return null;
         }
-        else
+        // try in defined
+        if (!definedStructuredNamespaces2.containsKey(qName.getNamespaceURI()))
         {
-            // try in defined
-            if 
(!definedStructuredNamespaces2.containsKey(qName.getNamespaceURI()))
-            {
-                // not found
-                if (factory != null)
-                {
-                    return null; // pre PDFBOX-6133 behavior
-                }
-                throw new BadFieldValueException("No descriptor found for " + 
qName);
-            }
-            else
+            // not found
+            if (factory != null)
             {
-                return createPropertyType(Types.DefinedType, 
Cardinality.Simple);
+                return null; // pre PDFBOX-6133 behavior
             }
+            throw new BadFieldValueException("No descriptor found for " + 
qName);
+        }
+        else
+        {
+            return createPropertyType(Types.DefinedType, Cardinality.Simple);
         }
     }