velocity-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From nbu...@apache.org
Subject svn commit: r686300 - in /velocity/engine/trunk/src: java/org/apache/velocity/runtime/RuntimeInstance.java java/org/apache/velocity/util/MapFactory.java test/org/apache/velocity/test/VarargMethodsTestCase.java
Date Fri, 15 Aug 2008 18:15:17 GMT
Author: nbubna
Date: Fri Aug 15 11:15:16 2008
New Revision: 686300

URL: http://svn.apache.org/viewvc?rev=686300&view=rev
Log:
fix a few java 1.5-isms that snuck in

Modified:
    velocity/engine/trunk/src/java/org/apache/velocity/runtime/RuntimeInstance.java
    velocity/engine/trunk/src/java/org/apache/velocity/util/MapFactory.java
    velocity/engine/trunk/src/test/org/apache/velocity/test/VarargMethodsTestCase.java

Modified: velocity/engine/trunk/src/java/org/apache/velocity/runtime/RuntimeInstance.java
URL: http://svn.apache.org/viewvc/velocity/engine/trunk/src/java/org/apache/velocity/runtime/RuntimeInstance.java?rev=686300&r1=686299&r2=686300&view=diff
==============================================================================
--- velocity/engine/trunk/src/java/org/apache/velocity/runtime/RuntimeInstance.java (original)
+++ velocity/engine/trunk/src/java/org/apache/velocity/runtime/RuntimeInstance.java Fri Aug
15 11:15:16 2008
@@ -289,7 +289,7 @@
             catch (Exception e)
             {
                 getLog().error("Could not auto-initialize Velocity", e);
-                throw new IllegalStateException("Velocity could not be initialized!", e);
+                throw new RuntimeException("Velocity could not be initialized!", e);
             }
         }
     }

Modified: velocity/engine/trunk/src/java/org/apache/velocity/util/MapFactory.java
URL: http://svn.apache.org/viewvc/velocity/engine/trunk/src/java/org/apache/velocity/util/MapFactory.java?rev=686300&r1=686299&r2=686300&view=diff
==============================================================================
--- velocity/engine/trunk/src/java/org/apache/velocity/util/MapFactory.java (original)
+++ velocity/engine/trunk/src/java/org/apache/velocity/util/MapFactory.java Fri Aug 15 11:15:16
2008
@@ -89,7 +89,7 @@
                 }
                 catch (Exception ex)
                 {
-                    throw new IllegalStateException("this should not happen", ex);
+                    throw new RuntimeException("this should not happen", ex);
                 }
             }
             else

Modified: velocity/engine/trunk/src/test/org/apache/velocity/test/VarargMethodsTestCase.java
URL: http://svn.apache.org/viewvc/velocity/engine/trunk/src/test/org/apache/velocity/test/VarargMethodsTestCase.java?rev=686300&r1=686299&r2=686300&view=diff
==============================================================================
--- velocity/engine/trunk/src/test/org/apache/velocity/test/VarargMethodsTestCase.java (original)
+++ velocity/engine/trunk/src/test/org/apache/velocity/test/VarargMethodsTestCase.java Fri
Aug 15 11:15:16 2008
@@ -66,7 +66,7 @@
         context.put("objects", new Object[] { this, Test.class });
         context.put("strings", new String[] { "one", "two" });
         context.put("doubles", new double[] { 1.5, 2.5 });
-        context.put("float", Float.valueOf(1f));
+        context.put("float", new Float(1f));
         context.put("ints", new int[] { 1, 2 });
     }
 



Mime
View raw message