Author: sebb
Date: Wed Aug 5 08:57:31 2009
New Revision: 801090
URL: http://svn.apache.org/viewvc?rev=801090&view=rev
Log:
JEXL-68 Revert part of r801035 (incorrectly removed .tolong() coercions)
Modified:
commons/proper/jexl/branches/2.0/src/main/java/org/apache/commons/jexl/JexlEngine.java
Modified:
commons/proper/jexl/branches/2.0/src/main/java/org/apache/commons/jexl/JexlEngine.java
URL:
http://svn.apache.org/viewvc/commons/proper/jexl/branches/2.0/src/main/java/org/apache/commons/jexl/JexlEngine.java?rev=801090&r1=801089&r2=801090&view=diff
==============================================================================
---
commons/proper/jexl/branches/2.0/src/main/java/org/apache/commons/jexl/JexlEngine.java
(original)
+++
commons/proper/jexl/branches/2.0/src/main/java/org/apache/commons/jexl/JexlEngine.java
Wed Aug 5 08:57:31 2009
@@ -651,33 +651,33 @@
}
- /**
- * ExpressionFactory & ScriptFactory need a singleton and this is the
package
- * instance fulfilling that pattern.
- */
- @Deprecated
- // CSOFF: StaticVariableName
- private static volatile JexlEngine DEFAULT = null;
- // CSON: StaticVariableName
-
- /**
- * Retrieves a default JEXL engine.
- * @return the singleton
- * @deprecated use a new instance JexlEngine instead.
- */
- // CSOFF: DoubleCheckedLocking
- @Deprecated
- static JexlEngine getDefault() {
- // java 5 memory model fixes the lazy singleton initialization
- // using a double-check locking pattern using a volatile
- if (DEFAULT == null) {
- synchronized (JexlEngine.class) {
- if (DEFAULT == null) {
- DEFAULT = new JexlEngine();
- }
- }
- }
- return DEFAULT;
- }
- // CSON: DoubleCheckedLocking
+// /**
+// * ExpressionFactory & ScriptFactory need a singleton and this is the
package
+// * instance fulfilling that pattern.
+// */
+// @Deprecated
+// // CSOFF: StaticVariableName
+// private static volatile JexlEngine DEFAULT = null;
+// // CSON: StaticVariableName
+//
+// /**
+// * Retrieves a default JEXL engine.
+// * @return the singleton
+// * @deprecated use a new instance JexlEngine instead.
+// */
+// // CSOFF: DoubleCheckedLocking
+// @Deprecated
+// static JexlEngine getDefault() {
+// // java 5 memory model fixes the lazy singleton initialization
+// // using a double-check locking pattern using a volatile
+// if (DEFAULT == null) {
+// synchronized (JexlEngine.class) {
+// if (DEFAULT == null) {
+// DEFAULT = new JexlEngine();
+// }
+// }
+// }
+// return DEFAULT;
+// }
+// // CSON: DoubleCheckedLocking
}
\ No newline at end of file
