cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From serg...@apache.org
Subject svn commit: r1418770 - in /cxf/branches/2.6.x-fixes: ./ rt/rs/extensions/search/src/main/java/org/apache/cxf/jaxrs/ext/search/fiql/FiqlParser.java
Date Sat, 08 Dec 2012 22:31:40 GMT
Author: sergeyb
Date: Sat Dec  8 22:31:39 2012
New Revision: 1418770

URL: http://svn.apache.org/viewvc?rev=1418770&view=rev
Log:
Merged revisions 1418024 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/trunk

........
  r1418024 | sergeyb | 2012-12-06 18:31:17 +0000 (Thu, 06 Dec 2012) | 1 line
  
  Minor fix to the search code
........

Modified:
    cxf/branches/2.6.x-fixes/   (props changed)
    cxf/branches/2.6.x-fixes/rt/rs/extensions/search/src/main/java/org/apache/cxf/jaxrs/ext/search/fiql/FiqlParser.java

Propchange: cxf/branches/2.6.x-fixes/
------------------------------------------------------------------------------
  Merged /cxf/trunk:r1418024

Propchange: cxf/branches/2.6.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: cxf/branches/2.6.x-fixes/rt/rs/extensions/search/src/main/java/org/apache/cxf/jaxrs/ext/search/fiql/FiqlParser.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/rt/rs/extensions/search/src/main/java/org/apache/cxf/jaxrs/ext/search/fiql/FiqlParser.java?rev=1418770&r1=1418769&r2=1418770&view=diff
==============================================================================
--- cxf/branches/2.6.x-fixes/rt/rs/extensions/search/src/main/java/org/apache/cxf/jaxrs/ext/search/fiql/FiqlParser.java
(original)
+++ cxf/branches/2.6.x-fixes/rt/rs/extensions/search/src/main/java/org/apache/cxf/jaxrs/ext/search/fiql/FiqlParser.java
Sat Dec  8 22:31:39 2012
@@ -344,7 +344,7 @@ public class FiqlParser<T> implements Se
                         nextObject = isPrimitive ? InjectionUtils.convertStringToPrimitive(value,
returnType) 
                             : convertToDate(value);
                     } else {
-                        nextObject = Collections.singletonList(value);
+                        nextObject = getCollectionSingleton(valueType, value);
                     }
                 } else {
                     nextObject = returnType.newInstance();
@@ -355,7 +355,7 @@ public class FiqlParser<T> implements Se
                 
                 lastCastedValue = lastCastedValue == null ? valueObject : lastCastedValue;
                 if (lastTry) {
-                    return isCollection ? Collections.singletonList(lastCastedValue) : lastCastedValue;
+                    return isCollection ? getCollectionSingleton(valueType, lastCastedValue)
: lastCastedValue;
                 } 
                 
                 TypeInfo nextTypeInfo = new TypeInfo(nextObject.getClass(), getterM.getGenericReturnType());




Mime
View raw message