Heinous merge from HEAD. Seems to basically work. Be on guard however.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@4137 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Britt Park
2006-10-18 02:24:36 +00:00
parent 6441f470f5
commit 111296d4dc
156 changed files with 18940 additions and 14167 deletions

View File

@@ -25,7 +25,6 @@ import java.util.Queue;
import org.alfresco.error.AlfrescoRuntimeException;
import org.alfresco.repo.policy.Policy.Arg;
import org.alfresco.repo.rule.RuleTransactionListener;
import org.alfresco.repo.transaction.AlfrescoTransactionSupport;
import org.alfresco.repo.transaction.TransactionListener;
import org.alfresco.util.GUID;
@@ -214,7 +213,7 @@ public class TransactionBehaviourQueue implements TransactionListener
{
return true;
}
if (obj instanceof RuleTransactionListener)
if (obj instanceof TransactionBehaviourQueue)
{
TransactionBehaviourQueue that = (TransactionBehaviourQueue) obj;
return (this.id.equals(that.id));