You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@manifoldcf.apache.org by kw...@apache.org on 2011/09/09 10:37:31 UTC
svn commit: r1167043 - in
/incubator/lcf/branches/release-0.3-incubating-branch: ./ CHANGES.txt
framework/script-engine/src/main/java/org/apache/manifoldcf/scriptengine/VariableConfigurationNode.java
Author: kwright
Date: Fri Sep 9 08:37:31 2011
New Revision: 1167043
URL: http://svn.apache.org/viewvc?rev=1167043&view=rev
Log:
Pull up CONNECTORS-253.
Modified:
incubator/lcf/branches/release-0.3-incubating-branch/ (props changed)
incubator/lcf/branches/release-0.3-incubating-branch/CHANGES.txt
incubator/lcf/branches/release-0.3-incubating-branch/framework/script-engine/src/main/java/org/apache/manifoldcf/scriptengine/VariableConfigurationNode.java
Propchange: incubator/lcf/branches/release-0.3-incubating-branch/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Sep 9 08:37:31 2011
@@ -6,4 +6,6 @@
/incubator/lcf/branches/CONNECTORS-223:1146689-1146810
/incubator/lcf/branches/CONNECTORS-224:1154884-1158633
/incubator/lcf/branches/CONNECTORS-236:1153921-1154314
+/incubator/lcf/branches/CONNECTORS-240:1163953-1166425
/incubator/lcf/branches/CONNECTORS-32:1092556-1094216
+/incubator/lcf/trunk:1167039
Modified: incubator/lcf/branches/release-0.3-incubating-branch/CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/release-0.3-incubating-branch/CHANGES.txt?rev=1167043&r1=1167042&r2=1167043&view=diff
==============================================================================
--- incubator/lcf/branches/release-0.3-incubating-branch/CHANGES.txt (original)
+++ incubator/lcf/branches/release-0.3-incubating-branch/CHANGES.txt Fri Sep 9 08:37:31 2011
@@ -3,6 +3,10 @@ $Id$
======================= 0.3-dev =========================
+CONNECTORS-253: Make script output of configurationnode script object
+have attributes that are ordered, so the test does not depend on hash order.
+(Shinichiro Abe, Karl Wright)
+
CONNECTORS-246, CONNECTORS-248, CONNECTORS-249: Problems with MVCC
model of Hsqldb causing query inconsistencies, fixed in HSQLDB 2.2.5-6-9-2011.
(Fred Toussi, Karl Wright)
Modified: incubator/lcf/branches/release-0.3-incubating-branch/framework/script-engine/src/main/java/org/apache/manifoldcf/scriptengine/VariableConfigurationNode.java
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/release-0.3-incubating-branch/framework/script-engine/src/main/java/org/apache/manifoldcf/scriptengine/VariableConfigurationNode.java?rev=1167043&r1=1167042&r2=1167043&view=diff
==============================================================================
--- incubator/lcf/branches/release-0.3-incubating-branch/framework/script-engine/src/main/java/org/apache/manifoldcf/scriptengine/VariableConfigurationNode.java (original)
+++ incubator/lcf/branches/release-0.3-incubating-branch/framework/script-engine/src/main/java/org/apache/manifoldcf/scriptengine/VariableConfigurationNode.java Fri Sep 9 08:37:31 2011
@@ -53,9 +53,18 @@ public class VariableConfigurationNode e
sb.append(" : ");
boolean needComma = false;
Iterator<String> iter = configurationNode.getAttributes();
+ String[] attrs = new String[configurationNode.getAttributeCount()];
+ int i = 0;
while (iter.hasNext())
{
String attrName = iter.next();
+ attrs[i++] = attrName;
+ }
+ java.util.Arrays.sort(attrs);
+ i = 0;
+ while (i < attrs.length)
+ {
+ String attrName = attrs[i++];
String value = configurationNode.getAttributeValue(attrName);
if (needComma)
sb.append(", ");
@@ -66,7 +75,7 @@ public class VariableConfigurationNode e
sb.append(new VariableString(value).getScriptValue());
}
sb.append(" : ");
- int i = 0;
+ i = 0;
while (i < configurationNode.getChildCount())
{
ConfigurationNode child = configurationNode.findChild(i);