Author: sergeyb
Date: Fri Nov 16 15:01:50 2012
New Revision: 1410384
URL: http://svn.apache.org/viewvc?rev=1410384&view=rev
Log:
Merged revisions 1410382 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1410382 | sergeyb | 2012-11-16 14:59:04 +0000 (Fri, 16 Nov 2012) | 1 line
Fixing the build failure
........
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/PrimitiveSearchCondition.java
Propchange: cxf/branches/2.6.x-fixes/
------------------------------------------------------------------------------
Merged /cxf/trunk:r1410382
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/PrimitiveSearchCondition.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/PrimitiveSearchCondition.java?rev=1410384&r1=1410383&r2=1410384&view=diff
==============================================================================
---
cxf/branches/2.6.x-fixes/rt/rs/extensions/search/src/main/java/org/apache/cxf/jaxrs/ext/search/PrimitiveSearchCondition.java
(original)
+++
cxf/branches/2.6.x-fixes/rt/rs/extensions/search/src/main/java/org/apache/cxf/jaxrs/ext/search/PrimitiveSearchCondition.java
Fri Nov 16 15:01:50 2012
@@ -37,6 +37,13 @@ public class PrimitiveSearchCondition<T>
public PrimitiveSearchCondition(String propertyName,
Object propertyValue,
+ ConditionType ct,
+ T condition) {
+ this(propertyName, propertyValue, propertyValue.getClass(), ct,
condition);
+ }
+
+ public PrimitiveSearchCondition(String propertyName,
+ Object propertyValue,
Type propertyType,
ConditionType ct,
T condition) {
