PDFBOX-5660: refactor, as suggested by Valery Bokov, closes #373

git-svn-id: https://svn.apache.org/repos/asf/pdfbox/trunk@1930555 13f79535-47bb-0310-9956-ffa450edef68

Author: THausherr

pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/color/PDColorSpace.java

@@ -245,20 +245,26 @@ private static PDColorSpace createFromCOSObject(COSObject colorSpace, PDResource
             throws IOException
     {
         PDColorSpace cs;
-        if (resources != null && resources.getResourceCache() != null)
+        if (resources != null)
         {
             ResourceCache resourceCache = resources.getResourceCache();
-            cs = resourceCache.getColorSpace(colorSpace);
-            if (cs != null)
+            if (resourceCache != null)
             {
-                return cs;
+                cs = resourceCache.getColorSpace(colorSpace);
+                if (cs != null)
+                {
+                    return cs;
+                }
+            }
+            cs = create(colorSpace.getObject(), resources);
+            if (resourceCache != null && cs != null)
+            {
+                resourceCache.put(colorSpace, cs);
             }
         }
-        cs = create(colorSpace.getObject(), resources);
-        if (resources != null && resources.getResourceCache() != null && cs != null)
+        else
         {
-            ResourceCache resourceCache = resources.getResourceCache();
-            resourceCache.put(colorSpace, cs);
+            cs = create(colorSpace.getObject();
         }
         return cs;
     }