Revision 30562

View differences:

branches/v2_0_0_prep/libraries/libEvaluator_SQLJEP/src/org/gvsig/tools/evaluator/sqljep/function/GeomFromText.java
49 49
	private static final Logger logger = LoggerFactory.getLogger(GeomFromText.class);
50 50
	
51 51
	private static Geometry nullGeometry = null;
52
	private static Object lock = new Object();
52 53

  
53 54
	public static final String NAME = "GeomFromText";
54 55
	private static String lastTextGeometry="";
......
61 62

  
62 63
	public GeomFromText() {
63 64
		super();
64
		if (nullGeometry == null) {
65
			try {
66
				nullGeometry = geomManager.createNullGeometry(SUBTYPES.GEOM2D);
67
			} catch (CreateGeometryException e) {
68
				logger.error("Error creating a null geometry", e);
69
			}
70
		}
71 65
	}
72 66

  
73 67
	/*
......
102 96
		}
103 97
		return lastGeometry;
104 98
	}
99
	
100
	private static Geometry getNullGeometry() {
101
		synchronized (lock) {
102
			if (nullGeometry == null) {
103
				try {
104
					nullGeometry = geomManager.createNullGeometry(SUBTYPES.GEOM2D);
105
				} catch (CreateGeometryException e) {
106
					logger.error("Error creating a null geometry", e);
107
				}
108
			}
109
		}
110
		return nullGeometry;
111
	}
105 112

  
106
}
113
}

Also available in: Unified diff