Adjust init of PresetGeometries to not keep the object if static initialization fails

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

diff --git a/src/java/org/apache/poi/sl/draw/geom/PresetGeometries.java b/src/java/org/apache/poi/sl/draw/geom/PresetGeometries.java
index 676155361a9aae7513edaeb506732adc3cf8cdfb..c5aef249fe4a9b43d6e5798bb34551d1b0a22c33 100644 (file)
--- a/src/java/org/apache/poi/sl/draw/geom/PresetGeometries.java
+++ b/src/java/org/apache/poi/sl/draw/geom/PresetGeometries.java
@@ -96,18 +96,23 @@ public class PresetGeometries extends LinkedHashMap<String, CustomGeometry> {
 
     public static synchronized PresetGeometries getInstance(){
         if(_inst == null) {
-            _inst = new PresetGeometries();
+            // use a local object first to not assign a partly constructed object
+            // in case of failure
+            PresetGeometries lInst = new PresetGeometries();
             try {
                 InputStream is = PresetGeometries.class.
                     getResourceAsStream("presetShapeDefinitions.xml");
-                _inst.init(is);
-                is.close();
+                try {
+                    lInst.init(is);
+                } finally {
+                    is.close();
+                }
             } catch (Exception e){
                 throw new RuntimeException(e);
             }
+            _inst = lInst;
         }
 
         return _inst;
     }
-
 }

diff --git a/src/testcases/org/apache/poi/sl/draw/geom/TestPresetGeometries.java b/src/testcases/org/apache/poi/sl/draw/geom/TestPresetGeometries.java
index 079a22a8db42cc15e7544a140ffc0ecee9578dd0..841d5f81da5a3ba40c6d41c474487f69607386b1 100644 (file)
--- a/src/testcases/org/apache/poi/sl/draw/geom/TestPresetGeometries.java
+++ b/src/testcases/org/apache/poi/sl/draw/geom/TestPresetGeometries.java
@@ -18,11 +18,13 @@
  */
 package org.apache.poi.sl.draw.geom;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.*;
 
 import java.awt.geom.GeneralPath;
 import java.awt.geom.Rectangle2D;
+import java.io.IOException;
+import java.net.URL;
+import java.util.Enumeration;
 import java.util.Map;
 
 import org.junit.Test;
@@ -35,11 +37,9 @@ import org.junit.Test;
 public class TestPresetGeometries {
     @Test
     public void testRead(){
-
         Map<String, CustomGeometry> shapes = PresetGeometries.getInstance();
         assertEquals(187, shapes.size());
 
-
         for(String name : shapes.keySet()) {
             CustomGeometry geom = shapes.get(name);
             Context ctx = new Context(geom, new Rectangle2D.Double(0, 0, 100, 100), new IAdjustableShape() {
@@ -52,8 +52,11 @@ public class TestPresetGeometries {
                 assertNotNull(path);
             }
         }
+        
+        // we get the same instance on further calls
+        assertTrue(shapes == PresetGeometries.getInstance());
     }
-    
+
     // helper methods to adjust list of presets for other tests
     public static void clearPreset() {
         // ensure that we are initialized
@@ -66,4 +69,24 @@ public class TestPresetGeometries {
     public static void resetPreset() {
         PresetGeometries._inst = null;
     }
+
+    @Test
+    public void testCheckXMLParser() throws Exception{
+        // Gump reports a strange error because of an unavailable XML Parser, let's try to find out where 
+        // this comes from
+        // 
+        Enumeration<URL> resources = this.getClass().getClassLoader().getResources("META-INF/services/javax.xml.stream.XMLEventFactory");
+        printURLs(resources);
+        resources = ClassLoader.getSystemResources("META-INF/services/javax.xml.stream.XMLEventFactory");
+        printURLs(resources);
+        resources = ClassLoader.getSystemResources("org/apache/poi/sl/draw/geom/presetShapeDefinitions.xml");
+        printURLs(resources);
+    }
+
+    private void printURLs(Enumeration<URL> resources) {
+        while(resources.hasMoreElements()) {
+            URL url = resources.nextElement();
+            System.out.println("URL: " + url);
+        }
+    }
 }