velocity-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From nbu...@apache.org
Subject svn commit: r726732 - in /velocity/engine/branches/1.6.x/src: changes/changes.xml java/org/apache/velocity/runtime/directive/Foreach.java test/org/apache/velocity/test/StrictReferenceTestCase.java
Date Mon, 15 Dec 2008 16:35:36 GMT
Author: nbubna
Date: Mon Dec 15 08:35:36 2008
New Revision: 726732

URL: http://svn.apache.org/viewvc?rev=726732&view=rev
Log:
merge relevant changes from trunk for possible 1.6.2

Modified:
    velocity/engine/branches/1.6.x/src/changes/changes.xml
    velocity/engine/branches/1.6.x/src/java/org/apache/velocity/runtime/directive/Foreach.java
    velocity/engine/branches/1.6.x/src/test/org/apache/velocity/test/StrictReferenceTestCase.java

Modified: velocity/engine/branches/1.6.x/src/changes/changes.xml
URL: http://svn.apache.org/viewvc/velocity/engine/branches/1.6.x/src/changes/changes.xml?rev=726732&r1=726731&r2=726732&view=diff
==============================================================================
--- velocity/engine/branches/1.6.x/src/changes/changes.xml (original)
+++ velocity/engine/branches/1.6.x/src/changes/changes.xml Mon Dec 15 08:35:36 2008
@@ -26,6 +26,14 @@
 
   <body>
 
+    <release version="1.6.2-dev" date="In Subversion">
+
+      <action type="fix" dev="cbrisson">
+          Fix $velocityHasNext so it is not always true.
+      </action>
+
+    </release>
+
     <release version="1.6.1" date="2008-12-15">
 
       <action type="fix" dev="nbubna" issue="VELOCITY-654" due-to="Byron Foster">

Modified: velocity/engine/branches/1.6.x/src/java/org/apache/velocity/runtime/directive/Foreach.java
URL: http://svn.apache.org/viewvc/velocity/engine/branches/1.6.x/src/java/org/apache/velocity/runtime/directive/Foreach.java?rev=726732&r1=726731&r2=726732&view=diff
==============================================================================
--- velocity/engine/branches/1.6.x/src/java/org/apache/velocity/runtime/directive/Foreach.java
(original)
+++ velocity/engine/branches/1.6.x/src/java/org/apache/velocity/runtime/directive/Foreach.java
Mon Dec 15 08:35:36 2008
@@ -341,8 +341,8 @@
         {
             // TODO: JDK 1.5+ -> Integer.valueOf()
             put(context, counterName , new Integer(counter));
-            put(context, hasNextName, Boolean.valueOf(i.hasNext()));
             Object value = i.next();
+            put(context, hasNextName, Boolean.valueOf(i.hasNext()));
             put(context, elementKey, value);
 
             try

Modified: velocity/engine/branches/1.6.x/src/test/org/apache/velocity/test/StrictReferenceTestCase.java
URL: http://svn.apache.org/viewvc/velocity/engine/branches/1.6.x/src/test/org/apache/velocity/test/StrictReferenceTestCase.java?rev=726732&r1=726731&r2=726732&view=diff
==============================================================================
--- velocity/engine/branches/1.6.x/src/test/org/apache/velocity/test/StrictReferenceTestCase.java
(original)
+++ velocity/engine/branches/1.6.x/src/test/org/apache/velocity/test/StrictReferenceTestCase.java
Mon Dec 15 08:35:36 2008
@@ -1,5 +1,24 @@
 package org.apache.velocity.test;
 
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+ */
+
 import org.apache.velocity.exception.MethodInvocationException;
 import org.apache.velocity.exception.VelocityException;
 import org.apache.velocity.exception.ParseErrorException;



Mime
View raw message