Update of /cvsroot/xdoclet/xdoclet/modules/ejb/src/xdoclet/modules/ejb/env
In directory
sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11295/modules/ejb/src/xdoclet/modules/ejb/env
Modified Files:
EnvEjbRefTagsHandler.java
Log Message:
fixed dupplicate ejb-external-ref detection (XDT-1325)
Index: EnvEjbRefTagsHandler.java
===================================================================
RCS file:
/cvsroot/xdoclet/xdoclet/modules/ejb/src/xdoclet/modules/ejb/env/EnvEjbRefTagsHandler.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** EnvEjbRefTagsHandler.java 6 Apr 2005 21:43:27 -0000 1.1
--- EnvEjbRefTagsHandler.java 8 Apr 2005 12:38:09 -0000 1.2
***************
*** 231,235 ****
XTag previousTag = (XTag) already.get(refName);
! if
(!previousTag.getAttributeValue("ejb-name").equals(currentTag.getAttributeValue("ejb-name")))
{
log.error("Duplicate @ejb.ejb-ref found with different
parameters!");
log.error("Previous tag: @ejb.ejb-ref ref-name=\"" +
--- 231,246 ----
XTag previousTag = (XTag) already.get(refName);
! String prevEjbName = previousTag.getAttributeValue("ejb-name");
!
! if (prevEjbName == null)
! prevEjbName = "";
!
! String prevJndiName = previousTag.getAttributeValue("jndi-name");
!
! if (prevJndiName == null)
! prevJndiName = "";
!
! if
(!(prevEjbName.equals(currentTag.getAttributeValue("ejb-name")) ||
!
prevJndiName.equals(currentTag.getAttributeValue("jndi-name")))) {
log.error("Duplicate @ejb.ejb-ref found with different
parameters!");
log.error("Previous tag: @ejb.ejb-ref ref-name=\"" +
-------------------------------------------------------
SF email is sponsored by - The IT Product Guide
Read honest & candid reviews on hundreds of IT Products from real users.
Discover which products truly live up to the hype. Start reading now.
http://ads.osdn.com/?ad_id=6595&alloc_id=14396&op=click
_______________________________________________
xdoclet-devel mailing list
xdoclet-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/xdoclet-devel
