db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject svn commit: r529866 - /db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/DataValueFactoryImpl.java
Date Wed, 18 Apr 2007 05:13:54 GMT
Author: mamta
Date: Tue Apr 17 22:13:53 2007
New Revision: 529866

URL: http://svn.apache.org/viewvc?view=rev&rev=529866
Log:
The previous patch for DERBY-2557 (revision 529697) had a bug in it. After getting a collation
sensitive DVD, the new method on DVF
(getInstanceUsingFormatIdAndCollationType) was still returning the DVD with UCS_BASIC collation.
This patch fixes that problem. More info
on this can be found in DERBY-2557.

Modified:
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/DataValueFactoryImpl.java

Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/DataValueFactoryImpl.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/DataValueFactoryImpl.java?view=diff&rev=529866&r1=529865&r2=529866
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/DataValueFactoryImpl.java
(original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/DataValueFactoryImpl.java
Tue Apr 17 22:13:53 2007
@@ -1149,10 +1149,9 @@
 					return returnObject;
 				//If we are dealing with territory based collation and 
 				//the object is of type StringDataValue, then we need to 
-				//create a StringDataValue with territory based collation.
+				//return a StringDataValue with territory based collation.
 				if (returnObject instanceof StringDataValue) 
-					((StringDataValue)returnObject).getValue(getCharacterCollator(collationType));
-				return returnObject;
+					return ((StringDataValue)returnObject).getValue(getCharacterCollator(collationType));
 			}
 			//This is the first time this method has been called for the passed
 			//format id and hence it's InstanceGetter is not in 
@@ -1186,10 +1185,9 @@
 						return returnObject;
 					//If we are dealing with territory based collation and 
 					//the object is of type StringDataValue, then we need to 
-					//create a StringDataValue with territory based collation.
+					//return a StringDataValue with territory based collation.
 					if (returnObject instanceof StringDataValue) 
-						((StringDataValue)returnObject).getValue(getCharacterCollator(collationType));
-						return returnObject;
+						return ((StringDataValue)returnObject).getValue(getCharacterCollator(collationType));
 				}
 				//InstanceGetter is not of the type FormatableInstanceGetter
 				instanceGettersForFormatIds[fmtIdPositionInInstanceGetterArray] = new ClassInfo(clazz);



Mime
View raw message