CVS: xdoclet/modules/jdo/src/xdoclet/modules/jdo/resources java_objectid.xdt,1.4,1.5

Update of /cvsroot/xdoclet/xdoclet/modules/jdo/src/xdoclet/modules/jdo/resources
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25945/modules/jdo/src/xdoclet/modules/jdo/resources

Modified Files:
	java_objectid.xdt 
Log Message:
- java_objectid.xdt: prevent NPE in hashcode()
- xtags.xml: fixed indent (only cosmetics)

Index: java_objectid.xdt
===================================================================
RCS file: /cvsroot/xdoclet/xdoclet/modules/jdo/src/xdoclet/modules/jdo/resources/java_objectid.xdt,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** java_objectid.xdt	31 Aug 2005 19:47:01 -0000	1.4
--- java_objectid.xdt	11 Jan 2006 22:54:08 -0000	1.5
***************
*** 263,267 ****
  				</XDtJdoObjectIdGenerator:ifCurrentPrimaryKeyFieldIsPrimitive>
  				<XDtJdoObjectIdGenerator:ifCurrentPrimaryKeyFieldIsNotPrimitive>
! 					<XDtJdoObjectIdGenerator:getCurrentPrimaryKeyFieldName/>.hashCode()
  				</XDtJdoObjectIdGenerator:ifCurrentPrimaryKeyFieldIsNotPrimitive>
  				<XDtJdoObjectIdGenerator:ifNotLastPrimaryKeyField>
--- 263,267 ----
  				</XDtJdoObjectIdGenerator:ifCurrentPrimaryKeyFieldIsPrimitive>
  				<XDtJdoObjectIdGenerator:ifCurrentPrimaryKeyFieldIsNotPrimitive>
! 					(<XDtJdoObjectIdGenerator:getCurrentPrimaryKeyFieldName/> == null ? 0 : <XDtJdoObjectIdGenerator:getCurrentPrimaryKeyFieldName/>.hashCode()) // Normally, it should never be null, but still it just happened to me! Marco.
  				</XDtJdoObjectIdGenerator:ifCurrentPrimaryKeyFieldIsNotPrimitive>
  				<XDtJdoObjectIdGenerator:ifNotLastPrimaryKeyField>



-------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc. Do you grep through log files
for problems?  Stop!  Download the new AJAX search engine that makes
searching your log files as easy as surfing the  web.  DOWNLOAD SPLUNK!
http://ads.osdn.com/?ad_id=7637&alloc_id=16865&op=click