You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@poi.apache.org by ce...@apache.org on 2015/07/27 17:39:35 UTC
svn commit: r1692898 - in /poi/trunk/src:
java/org/apache/poi/sl/draw/geom/PresetGeometries.java
testcases/org/apache/poi/sl/draw/geom/TestPresetGeometries.java
Author: centic
Date: Mon Jul 27 15:39:34 2015
New Revision: 1692898
URL: http://svn.apache.org/r1692898
Log:
Adjust init of PresetGeometries to not keep the object if static initialization fails
Modified:
poi/trunk/src/java/org/apache/poi/sl/draw/geom/PresetGeometries.java
poi/trunk/src/testcases/org/apache/poi/sl/draw/geom/TestPresetGeometries.java
Modified: poi/trunk/src/java/org/apache/poi/sl/draw/geom/PresetGeometries.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/sl/draw/geom/PresetGeometries.java?rev=1692898&r1=1692897&r2=1692898&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/sl/draw/geom/PresetGeometries.java (original)
+++ poi/trunk/src/java/org/apache/poi/sl/draw/geom/PresetGeometries.java Mon Jul 27 15:39:34 2015
@@ -96,18 +96,23 @@ public class PresetGeometries extends Li
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;
}
-
}
Modified: poi/trunk/src/testcases/org/apache/poi/sl/draw/geom/TestPresetGeometries.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/sl/draw/geom/TestPresetGeometries.java?rev=1692898&r1=1692897&r2=1692898&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/sl/draw/geom/TestPresetGeometries.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/sl/draw/geom/TestPresetGeometries.java Mon Jul 27 15:39:34 2015
@@ -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);
+ }
+ }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@poi.apache.org
For additional commands, e-mail: commits-help@poi.apache.org