You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by an...@apache.org on 2005/05/18 00:20:06 UTC
svn commit: r170678 -
/cocoon/branches/BRANCH_2_1_X/src/blocks/xsp/java/org/apache/cocoon/components/language/markup/Logicsheet.java
/cocoon/branches/BRANCH_2_1_X/status.xml
Author: anathaniel
Date: Tue May 17 15:20:04 2005
New Revision: 170678
URL: http://svn.apache.org/viewcvs?rev=170678&view=rev
Log:
Fixes http://issues.apache.org/bugzilla/show_bug.cgi?id=32934
XSP Block: Race condition could lead to duplicate application of same logicsheet
with spurious compilation errors or undefined runtime behaviour.
Modified:
cocoon/branches/BRANCH_2_1_X/src/blocks/xsp/java/org/apache/cocoon/components/language/markup/Logicsheet.java
cocoon/branches/BRANCH_2_1_X/status.xml
Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/xsp/java/org/apache/cocoon/components/language/markup/Logicsheet.java
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/xsp/java/org/apache/cocoon/components/language/markup/Logicsheet.java?rev=170678&r1=170677&r2=170678&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/xsp/java/org/apache/cocoon/components/language/markup/Logicsheet.java (original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/xsp/java/org/apache/cocoon/components/language/markup/Logicsheet.java Tue May 17 15:20:04 2005
@@ -95,6 +95,32 @@
}
}
+ /**
+ * Return true if other logicsheet has the same system id.
+ */
+ public boolean equals(Object other)
+ {
+ if (other == this)
+ return true;
+ if (other == null)
+ return false;
+ if (!(other instanceof Logicsheet))
+ return false;
+ Logicsheet that = (Logicsheet)other;
+ return this.systemId.equals(that.systemId);
+ }
+
+ /**
+ * Return hash code value for logicsheet.
+ */
+ public int hashCode()
+ {
+ return this.systemId.hashCode();
+ }
+
+ /**
+ * Return system id which uniquely identifies logicsheet.
+ */
public String getSystemId()
{
return this.systemId;
Modified: cocoon/branches/BRANCH_2_1_X/status.xml
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/status.xml?rev=170678&r1=170677&r2=170678&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/status.xml (original)
+++ cocoon/branches/BRANCH_2_1_X/status.xml Tue May 17 15:20:04 2005
@@ -93,6 +93,7 @@
<person name="Michael Melhem" email="michaelm@apache.org" id="MM"/>
<person name="Stephan Michels" email="stephan@apache.org" id="SMS"/>
<person name="John Morrison" email="morrijr@apache.org" id="JM"/>
+ <person name="Alfred Nathaniel" email="anathaniel@apache.org" id="AN"/>
<person name="Steven Noels" email="stevenn@apache.org" id="SN"/>
<person name="Christopher Oliver" email="coliver@apache.org" id="CO"/>
<person name="Giacomo Pati" email="giacomo@apache.org" id="GP"/>
@@ -196,6 +197,10 @@
<changes>
<release version="@version@" date="@date@">
+ <action dev="AN" type="fix" fixes-bug="32934">
+ XSP Block: Race condition could lead to duplicate application of same logicsheet
+ with spurious compilation errors or undefined runtime behaviour.
+ </action>
<action dev="UC" type="add">
Added CAPTCHA validator to Forms.
</action>