[Wonder-cvs] SF.net SVN: wonder:[11991] branches/Wonder_5_0_0_WebObjects_5_3_Branch/ Frameworks/EOAdaptors/JavaLuceneAdaptor/Sources/er/luceneadaptor/ ERLuceneAdaptorContext.java

[<an...@us...>]

Revision: 11991
          http://wonder.svn.sourceforge.net/wonder/?rev=11991&view=rev
Author:   anjo
Date:     2011-02-25 21:18:56 +0000 (Fri, 25 Feb 2011)

Log Message:
-----------
svn merge -c 11990 https://wonder.svn.sourceforge.net/svnroot/wonder/branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder .

Modified Paths:
--------------
    branches/Wonder_5_0_0_WebObjects_5_3_Branch/Frameworks/EOAdaptors/JavaLuceneAdaptor/Sources/er/luceneadaptor/ERLuceneAdaptorContext.java

Modified: branches/Wonder_5_0_0_WebObjects_5_3_Branch/Frameworks/EOAdaptors/JavaLuceneAdaptor/Sources/er/luceneadaptor/ERLuceneAdaptorContext.java
===================================================================
--- branches/Wonder_5_0_0_WebObjects_5_3_Branch/Frameworks/EOAdaptors/JavaLuceneAdaptor/Sources/er/luceneadaptor/ERLuceneAdaptorContext.java	2011-02-25 16:01:08 UTC (rev 11990)
+++ branches/Wonder_5_0_0_WebObjects_5_3_Branch/Frameworks/EOAdaptors/JavaLuceneAdaptor/Sources/er/luceneadaptor/ERLuceneAdaptorContext.java	2011-02-25 21:18:56 UTC (rev 11991)
@@ -45,14 +45,18 @@
 		String className = pkAttribute.className();
 		String valueType = pkAttribute.valueType();
 		if ("com.webobjects.foundation.NSData".equals(className)) {
-			ByteArrayBuffer buf = new ByteArrayBuffer();
-			try {
-				buf.write(entity.externalName().getBytes());
-				buf.write('.');
-				buf.write(new EOTemporaryGlobalID()._rawBytes());
-				pkValue = new NSData(buf.getRawData());
-			} catch (IOException e) {
-				throw NSForwardException._runtimeExceptionForThrowable(e);
+			if(true==false) {
+				ByteArrayBuffer buf = new ByteArrayBuffer();
+				try {
+					buf.write(entity.externalName().getBytes());
+					buf.write('.');
+					buf.write(new EOTemporaryGlobalID()._rawBytes());
+					pkValue = new NSData(buf.getRawData());
+				} catch (IOException e) {
+					throw NSForwardException._runtimeExceptionForThrowable(e);
+				}
+			} else {
+				pkValue = new NSData(new EOTemporaryGlobalID()._rawBytes());
 			}
 		} else {
 			throw new IllegalArgumentException("Unknown value type '" + valueType + "' for '" + object + "' of entity '" + entity.name() + "'.");


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.